mn10300: fix kernel build failures when using gcc-4.x
Fix some build failures when using gcc-4.x for MN10300. Firstly, __get_user() fails to build because the pointer points to a const and __gu_val ends up being read-only: In file included from include/linux/mempolicy.h:62, from init/main.c:50: include/linux/pagemap.h: In function 'fault_in_pages_readable': include/linux/pagemap.h:394: error: read-only variable '__gu_val' used as 'asm' output include/linux/pagemap.h:394: error: read-only variable '__gu_val' used as 'asm' output include/linux/pagemap.h:394: error: read-only variable '__gu_val' used as 'asm' output include/linux/pagemap.h:400: error: read-only variable '__gu_val' used as 'asm' output include/linux/pagemap.h:400: error: read-only variable '__gu_val' used as 'asm' output include/linux/pagemap.h:400: error: read-only variable '__gu_val' used as 'asm' output make[1]: *** [init/main.o] Error 1 Secondly, gcc-4 doesn't allow casts of lvalues: UPD include/linux/compile.h arch/mn10300/kernel/rtc.c: In function 'calibrate_clock': arch/mn10300/kernel/rtc.c:170: error: lvalue required as left operand of assignment arch/mn10300/kernel/rtc.c:172: error: lvalue required as left operand of assignment make[1]: *** [arch/mn10300/kernel/rtc.o] Error 1 These are seen with gcc 4.2.1. Signed-off-by: Mark Salter <msalter@redhat.com> Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
933d35f00c
commit
d22a001bf6
@@ -20,9 +20,9 @@ extern unsigned long mn10300_ioclk; /* IOCLK (crystal speed) in HZ */
|
||||
extern unsigned long mn10300_iobclk;
|
||||
extern unsigned long mn10300_tsc_per_HZ;
|
||||
|
||||
#define MN10300_IOCLK ((unsigned long)mn10300_ioclk)
|
||||
#define MN10300_IOCLK mn10300_ioclk
|
||||
/* If this processors has a another clock, uncomment the below. */
|
||||
/* #define MN10300_IOBCLK ((unsigned long)mn10300_iobclk) */
|
||||
/* #define MN10300_IOBCLK mn10300_iobclk */
|
||||
|
||||
#else /* !CONFIG_MN10300_RTC */
|
||||
|
||||
@@ -35,7 +35,7 @@ extern unsigned long mn10300_tsc_per_HZ;
|
||||
#define MN10300_TSCCLK MN10300_IOCLK
|
||||
|
||||
#ifdef CONFIG_MN10300_RTC
|
||||
#define MN10300_TSC_PER_HZ ((unsigned long)mn10300_tsc_per_HZ)
|
||||
#define MN10300_TSC_PER_HZ mn10300_tsc_per_HZ
|
||||
#else /* !CONFIG_MN10300_RTC */
|
||||
#define MN10300_TSC_PER_HZ (MN10300_TSCCLK/HZ)
|
||||
#endif /* !CONFIG_MN10300_RTC */
|
||||
|
Reference in New Issue
Block a user