diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-12 15:49:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-12 15:49:27 -0800 |
| commit | 94d40b699f0b9fb1b1da3b6abcd31d37c9aa2c22 (patch) | |
| tree | c719fbb7e7d44d74b4d7b571f7ed3f0d338daf71 /arch | |
| parent | 062dfa433cce9a2c3941b3b8b96ae678f11230fa (diff) | |
| parent | 1df2ab48f995b1599740a3f430df77fe24cb8ce9 (diff) | |
| download | linux-3.10-94d40b699f0b9fb1b1da3b6abcd31d37c9aa2c22.tar.gz linux-3.10-94d40b699f0b9fb1b1da3b6abcd31d37c9aa2c22.tar.bz2 linux-3.10-94d40b699f0b9fb1b1da3b6abcd31d37c9aa2c22.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc/Makefile | 2 | ||||
| -rw-r--r-- | arch/sparc/lib/atomic32.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile index dea48f6cff3..4cdbb2d59ed 100644 --- a/arch/sparc/Makefile +++ b/arch/sparc/Makefile @@ -34,7 +34,7 @@ libs-y += arch/sparc/prom/ arch/sparc/lib/ # Renaming is done to avoid confusing pattern matching rules in 2.5.45 (multy-) INIT_Y := $(patsubst %/, %/built-in.o, $(init-y)) CORE_Y := $(core-y) -CORE_Y += kernel/ mm/ fs/ ipc/ security/ crypto/ +CORE_Y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ CORE_Y := $(patsubst %/, %/built-in.o, $(CORE_Y)) DRIVERS_Y := $(patsubst %/, %/built-in.o, $(drivers-y)) NET_Y := $(patsubst %/, %/built-in.o, $(net-y)) diff --git a/arch/sparc/lib/atomic32.c b/arch/sparc/lib/atomic32.c index cb3cf0f2282..de84f8534ba 100644 --- a/arch/sparc/lib/atomic32.c +++ b/arch/sparc/lib/atomic32.c @@ -66,7 +66,6 @@ int atomic_add_unless(atomic_t *v, int a, int u) return ret != u; } -static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr) /* Atomic operations are already serializing */ void atomic_set(atomic_t *v, int i) { |