---- linux-2.6.27/arch/sparc/include/asm/spinlock_64.h~ 2007-02-04 19:44:54.000000000 +0100
-+++ linux-2.6.27/arch/sparc/include/asm/spinlock_64.h 2007-04-10 01:05:35.426190250 +0200
-@@ -105,7 +105,7 @@
-
- /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
-
--static void inline __read_lock(raw_rwlock_t *lock)
-+static inline void __read_lock(raw_rwlock_t *lock)
- {
- unsigned long tmp1, tmp2;
-
-@@ -130,7 +130,7 @@
- : "memory");
- }
-
--static int inline __read_trylock(raw_rwlock_t *lock)
-+static inline int __read_trylock(raw_rwlock_t *lock)
- {
- int tmp1, tmp2;
-
-@@ -152,7 +152,7 @@
- return tmp1;
- }
-
--static void inline __read_unlock(raw_rwlock_t *lock)
-+static inline void __read_unlock(raw_rwlock_t *lock)
- {
- unsigned long tmp1, tmp2;
-
-@@ -169,7 +169,7 @@
- : "memory");
- }
-
--static void inline __write_lock(raw_rwlock_t *lock)
-+static inline void __write_lock(raw_rwlock_t *lock)
- {
- unsigned long mask, tmp1, tmp2;
-
-@@ -196,7 +196,7 @@
- : "memory");
- }
-
--static void inline __write_unlock(raw_rwlock_t *lock)
-+static inline void __write_unlock(raw_rwlock_t *lock)
- {
- __asm__ __volatile__(
- " membar #LoadStore | #StoreStore\n"
-@@ -206,7 +206,7 @@
- : "memory");
- }
-
--static int inline __write_trylock(raw_rwlock_t *lock)
-+static inline int __write_trylock(raw_rwlock_t *lock)
- {
- unsigned long mask, tmp1, tmp2, result;
-
--- linux-2.6.20/arch/powerpc/kernel/prom_init.c~ 2007-02-04 19:44:54.000000000 +0100
+++ linux-2.6.20/arch/powerpc/kernel/prom_init.c 2007-04-10 01:59:33.712570500 +0200
@@ -429,14 +429,14 @@