diff options
| author | David S. Miller <davem@davemloft.net> | 2011-06-21 01:29:08 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-21 01:29:08 -0400 |
| commit | 9f6ec8d697c08963d83880ccd35c13c5ace716ea (patch) | |
| tree | ad8d93cf6fcdd09b86ade09f5fcbbc66cdb1cca2 /arch/sparc/include/asm/system_64.h | |
| parent | 4aa3a715551c93eda32d79bd52042ce500bd5383 (diff) | |
| parent | 56299378726d5f2ba8d3c8cbbd13cb280ba45e4f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
drivers/net/wireless/rtlwifi/pci.c
net/netfilter/ipvs/ip_vs_core.c
Diffstat (limited to 'arch/sparc/include/asm/system_64.h')
| -rw-r--r-- | arch/sparc/include/asm/system_64.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/system_64.h b/arch/sparc/include/asm/system_64.h index 3c96d3bb9f15..10bcabce97b2 100644 --- a/arch/sparc/include/asm/system_64.h +++ b/arch/sparc/include/asm/system_64.h | |||
| @@ -234,7 +234,7 @@ static inline unsigned long __xchg(unsigned long x, __volatile__ void * ptr, | |||
| 234 | return xchg32(ptr, x); | 234 | return xchg32(ptr, x); |
| 235 | case 8: | 235 | case 8: |
| 236 | return xchg64(ptr, x); | 236 | return xchg64(ptr, x); |
| 237 | }; | 237 | } |
| 238 | __xchg_called_with_bad_pointer(); | 238 | __xchg_called_with_bad_pointer(); |
| 239 | return x; | 239 | return x; |
| 240 | } | 240 | } |