diff options
| author | Linus Torvalds <torvalds@home.osdl.org> | 2003-09-21 07:31:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2003-09-21 07:31:26 -0700 |
| commit | 1c20618e2767bdcbe27e331a118a6f0e58eb64d2 (patch) | |
| tree | 4485ed92314ddcf94cc3f3bd5421b7e1cb363ca8 | |
| parent | a442806d8f665fbc612f7337ad6f74d34e0bb8f2 (diff) | |
| parent | 28a692a86d875dc8d82c64c6d1939c91001a50a2 (diff) | |
Merge bk://kernel.bkbits.net/davem/sparc-2.5
into home.osdl.org:/home/torvalds/v2.5/linux
| -rw-r--r-- | arch/sparc/kernel/sun4d_smp.c | 10 | ||||
| -rw-r--r-- | arch/sparc/mm/srmmu.c | 7 | ||||
| -rw-r--r-- | drivers/sbus/char/bpp.c | 1 | ||||
| -rw-r--r-- | drivers/sbus/char/cpwatchdog.c | 1 | ||||
| -rw-r--r-- | drivers/sbus/char/display7seg.c | 1 |
5 files changed, 5 insertions, 15 deletions
diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c index 9810917d2bff..7b4170081f5c 100644 --- a/arch/sparc/kernel/sun4d_smp.c +++ b/arch/sparc/kernel/sun4d_smp.c @@ -343,11 +343,11 @@ void smp4d_cross_call(smpfunc_t func, unsigned long arg1, unsigned long arg2, unsigned long a3 asm("i3") = arg3; unsigned long a4 asm("i4") = arg4; unsigned long a5 asm("i5") = arg5; - - __asm__ __volatile__(" - std %0, [%6] - std %2, [%6 + 8] - std %4, [%6 + 16]" : : + + __asm__ __volatile__( + "std %0, [%6]\n\t" + "std %2, [%6 + 8]\n\t" + "std %4, [%6 + 16]\n\t" : : "r"(f), "r"(a1), "r"(a2), "r"(a3), "r"(a4), "r"(a5), "r" (&ccall_info.func)); } diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c index fe0584e049db..d86c40fba8db 100644 --- a/arch/sparc/mm/srmmu.c +++ b/arch/sparc/mm/srmmu.c @@ -330,9 +330,6 @@ static unsigned long __srmmu_get_nocache(int size, int align) offset = bit_map_string_get(&srmmu_nocache_map, size >> SRMMU_NOCACHE_BITMAP_SHIFT, align >> SRMMU_NOCACHE_BITMAP_SHIFT); -/* P3 */ /* printk("srmmu: get size %d align %d, got %d (0x%x)\n", - size >> SRMMU_NOCACHE_BITMAP_SHIFT, align >> SRMMU_NOCACHE_BITMAP_SHIFT, - offset, offset); */ if (offset == -1) { printk("srmmu: out of nocache %d: %d/%d\n", size, (int) srmmu_nocache_size, @@ -385,7 +382,6 @@ void srmmu_free_nocache(unsigned long vaddr, int size) offset = (vaddr - SRMMU_NOCACHE_VADDR) >> SRMMU_NOCACHE_BITMAP_SHIFT; size = size >> SRMMU_NOCACHE_BITMAP_SHIFT; -/* P3 */ /* printk("srmmu: free off %d (0x%x) size %d\n", offset, offset, size); */ bit_map_clear(&srmmu_nocache_map, offset, size); } @@ -447,9 +443,6 @@ void srmmu_nocache_init(void) paddr = __pa((unsigned long)srmmu_nocache_pool); vaddr = SRMMU_NOCACHE_VADDR; -/* P3 */ printk("srmmu: pool 0x%x vaddr 0x%x bitmap 0x%x bits %d (0x%x)\n", - (int)srmmu_nocache_pool, vaddr, srmmu_nocache_bitmap, bitmap_bits, bitmap_bits); - while (vaddr < srmmu_nocache_end) { pgd = pgd_offset_k(vaddr); pmd = srmmu_pmd_offset(__nocache_fix(pgd), vaddr); diff --git a/drivers/sbus/char/bpp.c b/drivers/sbus/char/bpp.c index ab7cc1b2f72f..daf16c9cc8db 100644 --- a/drivers/sbus/char/bpp.c +++ b/drivers/sbus/char/bpp.c @@ -12,7 +12,6 @@ #include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/fs.h> #include <linux/errno.h> #include <linux/sched.h> diff --git a/drivers/sbus/char/cpwatchdog.c b/drivers/sbus/char/cpwatchdog.c index 4a99ad0c5e32..51e4ada8a6a0 100644 --- a/drivers/sbus/char/cpwatchdog.c +++ b/drivers/sbus/char/cpwatchdog.c @@ -17,7 +17,6 @@ #include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/fs.h> #include <linux/errno.h> #include <linux/major.h> diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c index a35e60ee1f87..8d1a1e1b95b7 100644 --- a/drivers/sbus/char/display7seg.c +++ b/drivers/sbus/char/display7seg.c @@ -9,7 +9,6 @@ #include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/fs.h> #include <linux/errno.h> #include <linux/major.h> |