Commit ba7a00c3 authored by Paul Mundt's avatar Paul Mundt Committed by Linus Torvalds

[PATCH] sh: compile fixes

A few random build failures/warnings popped up in 2.6.9, this fixes them.
Signed-off-by: default avatarPaul Mundt <paul.mundt@nokia.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent abbc308a
...@@ -344,7 +344,7 @@ static inline int sched_find_first_bit(unsigned long *b) ...@@ -344,7 +344,7 @@ static inline int sched_find_first_bit(unsigned long *b)
#define ext2_test_bit(nr, addr) test_bit((nr), (addr)) #define ext2_test_bit(nr, addr) test_bit((nr), (addr))
#define ext2_find_first_zero_bit(addr, size) find_first_zero_bit((addr), (size)) #define ext2_find_first_zero_bit(addr, size) find_first_zero_bit((addr), (size))
#define ext2_find_next_zero_bit(addr, size, offset) \ #define ext2_find_next_zero_bit(addr, size, offset) \
find_next_zero_bit((addr), (size), (offset)) find_next_zero_bit((unsigned long *)(addr), (size), (offset))
#else #else
static __inline__ int ext2_set_bit(int nr, volatile void * addr) static __inline__ int ext2_set_bit(int nr, volatile void * addr)
{ {
......
...@@ -288,7 +288,7 @@ extern unsigned int kobjsize(const void *objp); ...@@ -288,7 +288,7 @@ extern unsigned int kobjsize(const void *objp);
#if defined(CONFIG_CPU_SH4) || defined(CONFIG_SH7705_CACHE_32KB) #if defined(CONFIG_CPU_SH4) || defined(CONFIG_SH7705_CACHE_32KB)
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR #define __HAVE_ARCH_PTEP_GET_AND_CLEAR
extern inline pte_t ptep_get_and_clear(pte_t *ptep); extern pte_t ptep_get_and_clear(pte_t *ptep);
#endif #endif
#include <asm-generic/pgtable.h> #include <asm-generic/pgtable.h>
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
*/ */
#include <linux/config.h> #include <linux/config.h>
#include <linux/kernel.h>
/* /*
* switch_to() should switch tasks to task nr n, first * switch_to() should switch tasks to task nr n, first
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment