diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 20:23:53 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 20:23:53 -0500 |
commit | 9e42d0cf5020aaf217433cad1a224745241d212a (patch) | |
tree | 8d64537c600024a4220d1309873ac3467726c3b0 /arch/sparc/include | |
parent | 97c440ba41d4e7cddb8e14c7c7ec49dad2560709 (diff) | |
parent | 18b8e08e290e9df588f51f5a7df50555f5a25664 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Work around branch tracer warning.
sparc64: Fix unsigned long long warnings in drivers.
sparc64: Use unsigned long long for u64.
sparc: refactor code in fault_32.c
sparc64: refactor code in init_64.c
sparc64: refactor code in viohs.c
sparc: make proces_ver_nack a bit more readable
Diffstat (limited to 'arch/sparc/include')
-rw-r--r-- | arch/sparc/include/asm/timer_64.h | 2 | ||||
-rw-r--r-- | arch/sparc/include/asm/types.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/include/asm/timer_64.h b/arch/sparc/include/asm/timer_64.h index 5b779fd1f788..ef3c3682debf 100644 --- a/arch/sparc/include/asm/timer_64.h +++ b/arch/sparc/include/asm/timer_64.h | |||
@@ -10,7 +10,7 @@ | |||
10 | #include <linux/init.h> | 10 | #include <linux/init.h> |
11 | 11 | ||
12 | struct sparc64_tick_ops { | 12 | struct sparc64_tick_ops { |
13 | unsigned long (*get_tick)(void); | 13 | unsigned long long (*get_tick)(void); |
14 | int (*add_compare)(unsigned long); | 14 | int (*add_compare)(unsigned long); |
15 | unsigned long softint_mask; | 15 | unsigned long softint_mask; |
16 | void (*disable_irq)(void); | 16 | void (*disable_irq)(void); |
diff --git a/arch/sparc/include/asm/types.h b/arch/sparc/include/asm/types.h index 8c28fde5eaa2..2237118825d0 100644 --- a/arch/sparc/include/asm/types.h +++ b/arch/sparc/include/asm/types.h | |||
@@ -11,7 +11,7 @@ | |||
11 | #if defined(__sparc__) && defined(__arch64__) | 11 | #if defined(__sparc__) && defined(__arch64__) |
12 | 12 | ||
13 | /*** SPARC 64 bit ***/ | 13 | /*** SPARC 64 bit ***/ |
14 | #include <asm-generic/int-l64.h> | 14 | #include <asm-generic/int-ll64.h> |
15 | 15 | ||
16 | #ifndef __ASSEMBLY__ | 16 | #ifndef __ASSEMBLY__ |
17 | 17 | ||