Skip to contentSkip to conversation

H8/300 warning fix

PATCH New Yoshinori Sato 1 participant 1 message Feb 21, 2004

lore
Share & tools
lore

Yoshinori Sato

author
#0 lore raw

PATCH 1/1 H8/300 warning fix

Fix any warnings

arch/h8300/platform/h8300h/entry.S +3 -3
diff -X .exclude-diff -Nru linux-2.6.3/arch/h8300/platform/h8300h/entry.S linux-2.6.3-h8300/arch/h8300/platform/h8300h/entry.S
@@ -236,7 +236,7 @@
 	mov.l	@(LER3:16,sp),er2
 	jsr	@er4
 	mov.l	er0,@(LER0:16,sp)		/* save the return value */
-	jsr	SYMBOL_NAME(syscall_trace)
+	jsr	@SYMBOL_NAME(syscall_trace)
 
 SYMBOL_NAME_LABEL(ret_from_signal)
 

@@ -253,7 +253,7 @@
 1:
 	mov.l	@(TI_FLAGS:16,er2),er1
 	btst	#TIF_NEED_RESCHED,r1l
-	bne	@SYMBOL_NAME(reschedule):16
+	bne	SYMBOL_NAME(reschedule):16
 	mov.l	sp,er1
 	subs	#4,er1			/* adjust retpc */
 	mov.l	er2,er0

@@ -273,7 +273,7 @@
 SYMBOL_NAME_LABEL(ret_from_fork)
 	mov.l	er2,er0
 	jsr	@SYMBOL_NAME(schedule_tail)
-	jmp	@SYMBOL_NAME_LABEL(ret_from_exception)	
+	jmp	@SYMBOL_NAME(ret_from_exception)	
 
 SYMBOL_NAME_LABEL(resume)
 	/*
arch/h8300/platform/h8300h/generic/crt0_rom.S +1 -0
diff -X .exclude-diff -Nru linux-2.6.3/arch/h8300/platform/h8300h/generic/crt0_rom.S linux-2.6.3-h8300/arch/h8300/platform/h8300h/generic/crt0_rom.S
@@ -105,6 +105,7 @@
 	;; PBDDR
 	.byte	0x00,0x00
 
+	.section .rodata
 __target_name:	
 	.asciz	"generic"
arch/h8300/platform/h8s/edosk2674/crt0_rom.S +1 -0
diff -X .exclude-diff -Nru linux-2.6.3/arch/h8300/platform/h8s/edosk2674/crt0_rom.S linux-2.6.3-h8300/arch/h8300/platform/h8s/edosk2674/crt0_rom.S
@@ -168,6 +168,7 @@
 	;; PHDDR
 	.byte	0x00,0x00
 
+	.section .rodata
 __target_name:	
 	.asciz	"EDOSK-2674"
arch/h8300/platform/h8s/entry.S +3 -3
diff -X .exclude-diff -Nru linux-2.6.3/arch/h8300/platform/h8s/entry.S linux-2.6.3-h8300/arch/h8300/platform/h8s/entry.S
@@ -233,7 +233,7 @@
 	mov.l	@(LER3:16,sp),er2
 	jsr	@er4
 	mov.l	er0,@(LER0:16,sp)		/* save the return value */
-	jsr	SYMBOL_NAME(syscall_trace)
+	jsr	@SYMBOL_NAME(syscall_trace)
 
 SYMBOL_NAME_LABEL(ret_from_signal)
 

@@ -250,7 +250,7 @@
 1:
 	mov.l	@(TI_FLAGS:16,er2),er1
 	btst	#TIF_NEED_RESCHED,r1l
-	bne	@SYMBOL_NAME(reschedule):16
+	bne	SYMBOL_NAME(reschedule):16
 	mov.l	sp,er1
 	subs	#4,er1			/* adjust retpc */
 	mov.l	er2,er0

@@ -270,6 +270,6 @@
 SYMBOL_NAME_LABEL(ret_from_fork)
 	mov.l	er2,er0
 	jsr	@SYMBOL_NAME(schedule_tail)
-	jmp	@SYMBOL_NAME_LABEL(ret_from_exception)	
+	jmp	@SYMBOL_NAME(ret_from_exception)
arch/h8300/platform/h8s/generic/crt0_rom.S +1 -0
diff -X .exclude-diff -Nru linux-2.6.3/arch/h8300/platform/h8s/generic/crt0_rom.S linux-2.6.3-h8300/arch/h8300/platform/h8s/generic/crt0_rom.S
@@ -110,6 +110,7 @@
 	;; PHDDR
 	.byte	0x00,0x00
 
+	.section .rodata
 __target_name:	
 	.asciz	"generic"
include/asm-h8300/ide.h +2 -2
diff -X .exclude-diff -Nru linux-2.6.3/include/asm-h8300/ide.h linux-2.6.3-h8300/include/asm-h8300/ide.h
@@ -18,7 +18,7 @@
 
 void h8300_ide_print_resource(char *name, hw_regs_t *hw);
-static inline int ide_default_irq(unsigned long base) { return 0; };
-static inline ide_ioreg_t ide_default_io_base(int index) { return 0; };
+static __inline__ int ide_default_irq(unsigned long base) { return 0; };
+static __inline__ unsigned long ide_default_io_base(int index) { return 0; };
 
 static __inline__ void ide_init_hwif_ports(hw_regs_t *hw, unsigned long data_port,
 	 unsigned long ctrl_port, int *irq)
include/asm-h8300/page.h +4 -4
diff -X .exclude-diff -Nru linux-2.6.3/include/asm-h8300/page.h linux-2.6.3-h8300/include/asm-h8300/page.h
@@ -1,12 +1,12 @@
-#ifndef _H8300NOMMU_PAGE_H
-#define _H8300NOMMU_PAGE_H
+#ifndef _H8300_PAGE_H
+#define _H8300_PAGE_H
 
 #include <linux/config.h>
 
 /* PAGE_SHIFT determines the page size */
 
 #define PAGE_SHIFT	(12)
-#define PAGE_SIZE	(4096)
+#define PAGE_SIZE	(1UL << PAGE_SHIFT)
 #define PAGE_MASK	(~(PAGE_SIZE-1))
 
 #ifdef __KERNEL__

@@ -98,4 +98,4 @@
 
 #endif /* __KERNEL__ */
 
-#endif /* _H8300NOMMU_PAGE_H */
+#endif /* _H8300_PAGE_H */
Signature · 2 lines
Yoshinori Sato
<[email protected]>