linux-0.11-040327-rh9.diff

LINUX的0.11YU REDHAT9.2配置区别

<          return __base;
< }
Only in linux/include/linux: sched.h.cur1
Only in linux/include/linux: sched.h.old
diff -r linux/include/string.h linux.org/include/string.h
34c34
< 	::"S" (src),"D" (dest));
---
> 	::"S" (src),"D" (dest):"si","di","ax");
38c38
< static inline char * strncpy(char * dest,const char *src,int count)
---
> extern inline char * strncpy(char * dest,const char *src,int count)
50c50
< 	::"S" (src),"D" (dest),"c" (count));
---
> 	::"S" (src),"D" (dest),"c" (count):"si","di","ax","cx");
64c64
< 	::"S" (src),"D" (dest),"a" (0),"c" (0xffffffff));
---
> 	::"S" (src),"D" (dest),"a" (0),"c" (0xffffffff):"si","di","ax","cx");
68c68
< static inline char * strncat(char * dest,const char * src,int count)
---
> extern inline char * strncat(char * dest,const char * src,int count)
84c84
< 	);
---
> 	:"si","di","ax","cx");
90c90
< register int __res ;
---
> register int __res __asm__("ax");
103c103
< 	:"=a" (__res):"D" (cs),"S" (ct));
---
> 	:"=a" (__res):"D" (cs),"S" (ct):"si","di");
107c107
< static inline int strncmp(const char * cs,const char * ct,int count)
---
> extern inline int strncmp(const char * cs,const char * ct,int count)
109c109
< register int __res ;
---
> register int __res __asm__("ax");
124c124
< 	:"=a" (__res):"D" (cs),"S" (ct),"c" (count));
---
> 	:"=a" (__res):"D" (cs),"S" (ct),"c" (count):"si","di","cx");
128c128
< static inline char * strchr(const char * s,char c)
---
> extern inline char * strchr(const char * s,char c)
130c130
< register char * __res ;
---
> register char * __res __asm__("ax");
141c141
< 	:"=a" (__res):"S" (s),"0" (c));
---
> 	:"=a" (__res):"S" (s),"0" (c):"si");
145c145
< static inline char * strrchr(const char * s,char c)
---
> extern inline char * strrchr(const char * s,char c)
147c147
< register char * __res; 
---
> register char * __res __asm__("dx");
157c157
< 	:"=d" (__res):"0" (0),"S" (s),"a" (c));
---
> 	:"=d" (__res):"0" (0),"S" (s),"a" (c):"ax","si");
163c163
< register char * __res;
---
> register char * __res __asm__("si");
181c181
< 	);
---
> 	:"ax","cx","dx","di");
187c187
< register char * __res;
---
> register char * __res __asm__("si");
205c205
< 	);
---
> 	:"ax","cx","dx","di");
211c211
< register char * __res ;
---
> register char * __res __asm__("si");
232c232
< 	);
---
> 	:"ax","cx","dx","di");
238c238
< register char * __res ;
---
> register char * __res __asm__("ax");
259c259
< 	);
---
> 	:"cx","dx","di","si");
265c265
< register int __res ;
---
> register int __res __asm__("cx");
271c271
< 	:"=c" (__res):"D" (s),"a" (0),"0" (0xffffffff));
---
> 	:"=c" (__res):"D" (s),"a" (0),"0" (0xffffffff):"di");
279c279
< register char * __res ;
---
> register char * __res __asm__("si");
332c332
< 	);
---
> 	:"ax","cx","dx","di");
336c336
< static inline void * memcpy(void * dest,const void * src, int n)
---
> extern inline void * memcpy(void * dest,const void * src, int n)
342c342
< 	);
---
> 	:"cx","si","di");
353c353
< 	);
---
> 	:"cx","si","di");
359c359
< 	);
---
> 	:"cx","si","di");
363c363
< static inline int memcmp(const void * cs,const void * ct,int count)
---
> extern inline int memcmp(const void * cs,const void * ct,int count)
365c365
< register int __res ;
---
> register int __res __asm__("ax");
375c375
< 	);
---
> 	:"si","di","cx");
381c381
< register void * __res ;
---
> register void * __res __asm__("di");
391c391
< 	);
---
> 	:"cx");
395c395
< static inline void * memset(void * s,char c,int count)
---
> extern inline void * memset(void * s,char c,int count)
401c401
< 	);
---
> 	:"cx","di");
diff -r linux/kernel/asm.s linux.org/kernel/asm.s
14,17c14,17
< .globl divide_error,debug,nmi,int3,overflow,bounds,invalid_op
< .globl double_fault,coprocessor_segment_overrun
< .globl invalid_TSS,segment_not_present,stack_segment
< .globl general_protection,coprocessor_error,irq13,reserved
---
> .globl _divide_error,_debug,_nmi,_int3,_overflow,_bounds,_invalid_op
> .globl _double_fault,_coprocessor_segment_overrun
> .globl _invalid_TSS,_segment_not_present,_stack_segment
> .globl _general_protection,_coprocessor_error,_irq13,_reserved
19,20c19,20
< divide_error:
< 	pushl $do_divide_error
---
> _divide_error:
> 	pushl $_do_divide_error
53,54c53,54
< debug:
< 	pushl $do_int3		# _do_debug
---
> _debug:
> 	pushl $_do_int3		# _do_debug
57,58c57,58
< nmi:
< 	pushl $do_nmi
---
> _nmi:
> 	pushl $_do_nmi
61,62c61,62
< int3:
< 	pushl $do_int3
---
> _int3:
> 	pushl $_do_int3
65,66c65,66
< overflow:
< 	pushl $do_overflow
---
> _overflow:
> 	pushl $_do_overflow
69,70c69,70
< bounds:
< 	pushl $do_bounds
---
> _bounds:
> 	pushl $_do_bounds
73,74c73,74
< invalid_op:
< 	pushl $do_invalid_op
---
> _invalid_op:
> 	pushl $_do_invalid_op
77,78c77,78
< coprocessor_segment_overrun:
< 	pushl $do_coprocessor_segment_overrun
---
> _coprocessor_segment_overrun:
> 	pushl $_do_coprocessor_segment_overrun
81,82c81,82
< reserved:
< 	pushl $do_reserved
---
> _reserved:
> 	pushl $_do_reserved
85c85
< irq13:
---
> _irq13:
95c95
< 	jmp coprocessor_error
---
> 	jmp _coprocessor_error
97,98c97,98
< double_fault:
< 	pushl $do_double_fault
---
> _double_fault:
> 	pushl $_do_double_fault
131,132c131,132
< invalid_TSS:
< 	pushl $do_invalid_TSS
---
> _invalid_TSS:
> 	pushl $_do_invalid_TSS
135,136c135,136
< segment_not_present:
< 	pushl $do_segment_not_present
---
> _segment_not_present:
> 	pushl $_do_segment_not_present
139,140c139,140
< stack_segment:
< 	pushl $do_stack_segment
---
> _stack_segment:
> 	pushl $_do_stack_segment
143,144c143,144
< general_protection:
< 	pushl $do_general_protection
---
> _general_protection:
> 	pushl $_do_general_protection
diff -r linux/kernel/blk_drv/blk.h linux.org/kernel/blk_drv/blk.h
41c41
< ((s1)->cmd<(s2)->cmd || ((s1)->cmd==(s2)->cmd && \
---
> ((s1)->cmd<(s2)->cmd || (s1)->cmd==(s2)->cmd && \
43c43
< (s1)->sector < (s2)->sector))))
---
> (s1)->sector < (s2)->sector)))
101c101
< static inline void unlock_buffer(struct buffer_head * bh)
---
> extern inline void unlock_buffer(struct buffer_head * bh)
109c109
< static inline void end_request(int uptodate)
---
> extern inline void end_request(int uptodate)
diff -r linux/kernel/blk_drv/floppy.c linux.org/kernel/blk_drv/floppy.c
158c158
< 	)
---
> 	:"cx","di","si")
diff -r linux/kernel/blk_drv/hd.c linux.org/kernel/blk_drv/hd.c
62c62
< __asm__("cld;rep;insw"::"d" (port),"D" (buf),"c" (nr))
---
> __asm__("cld;rep;insw"::"d" (port),"D" (buf),"c" (nr):"cx","di")
65c65
< __asm__("cld;rep;outsw"::"d" (port),"S" (buf),"c" (nr))
---
> __asm__("cld;rep;outsw"::"d" (port),"S" (buf),"c" (nr):"cx","si")
211c211
< 	if (i == (READY_STAT | SEEK_STAT))
---
> 	if (i == READY_STAT | SEEK_STAT)
296c296
< 	int i,r = 0;
---
> 	int i,r;
diff -r linux/kernel/blk_drv/ll_rw_blk.c linux.org/kernel/blk_drv/ll_rw_blk.c
79c79
< 		if ((IN_ORDER(tmp,req) || 
---
> 		if ((IN_ORDER(tmp,req) ||
95c95
< 	if ((rw_ahead = (rw == READA || rw == WRITEA))) {
---
> 	if (rw_ahead = (rw == READA || rw == WRITEA)) {
diff -r linux/kernel/blk_drv/Makefile linux.org/kernel/blk_drv/Makefile
9,11c9,11
< AR	=ar
< AS	=as
< LD	=ld
---
> AR	=gar
> AS	=gas
> LD	=gld
13,15c13,15
< CC	=gcc -mcpu=i386
< CFLAGS	=-Wall -O -fstrength-reduce -fomit-frame-pointer  \
< 	-finline-functions -nostdinc -I../../include
---
> CC	=gcc
> CFLAGS	=-Wall -O -fstrength-reduce -fomit-frame-pointer -fcombine-regs \
> 	-finline-functions -mstring-insns -nostdinc -I../../include
22c22
< 	$(AS) -o $*.o $<
---
> 	$(AS) -c -o $*.o $<
44,47c44,52
< floppy.s floppy.o: floppy.c ../../include/linux/sched.h ../../include/linux/head.h \
<   ../../include/linux/fs.h ../../include/sys/types.h \
<   ../../include/linux/mm.h ../../include/signal.h \
<   ../../include/linux/kernel.h ../../include/linux/fdreg.h \
---
> floppy.s floppy.o : floppy.c ../../include/linux/sched.h ../../include/linux/head.h \
>   ../../include/linux/fs.h ../../include/sys/types.h ../../include/linux/mm.h \
>   ../../include/signal.h ../../include/linux/kernel.h \
>   ../../include/linux/fdreg.h ../../include/asm/system.h \
>   ../../include/asm/io.h ../../include/asm/segment.h blk.h 
> hd.s hd.o : hd.c ../../include/linux/config.h ../../include/linux/sched.h \
>   ../../include/linux/head.h ../../include/linux/fs.h \
>   ../../include/sys/types.h ../../include/linux/mm.h ../../include/signal.h \
>   ../../include/linux/kernel.h ../../include/linux/hdreg.h \
49,50c54,55
<   ../../include/asm/segment.h blk.h
< hd.s hd.o: hd.c ../../include/linux/config.h ../../include/linux/sched.h \
---
>   ../../include/asm/segment.h blk.h 
> ll_rw_blk.s ll_rw_blk.o : ll_rw_blk.c ../../include/errno.h ../../include/linux/sched.h \
52,66c57,58
<   ../../include/sys/types.h ../../include/linux/mm.h \
<   ../../include/signal.h ../../include/linux/kernel.h \
<   ../../include/linux/hdreg.h ../../include/asm/system.h \
<   ../../include/asm/io.h ../../include/asm/segment.h blk.h
< ll_rw_blk.s ll_rw_blk.o: ll_rw_blk.c ../../include/errno.h \
<   ../../include/linux/sched.h ../../include/linux/head.h \
<   ../../include/linux/fs.h ../../include/sys/types.h \
<   ../../include/linux/mm.h ../../include/signal.h \
<   ../../include/linux/kernel.h ../../include/asm/system.h blk.h
< ramdisk.s ramdisk.o: ramdisk.c ../../include/string.h ../../include/linux/config.h \
<   ../../include/linux/sched.h ../../include/linux/head.h \
<   ../../include/linux/fs.h ../../include/sys/types.h \
<   ../../include/linux/mm.h ../../include/signal.h \
<   ../../include/linux/kernel.h ../../include/asm/system.h \
<   ../../include/asm/segment.h ../../include/asm/memory.h blk.h
---
>   ../../include/sys/types.h ../../include/linux/mm.h ../../include/signal.h \
>   ../../include/linux/kernel.h ../../include/asm/system.h blk.h 
diff -r linux/kernel/chr_drv/console.c linux.org/kernel/chr_drv/console.c
119c119
< 					"movl video_num_columns,%1\n\t"
---
> 					"movl _video_num_columns,%1\n\t"
126c126
< 					);
---
> 					:"cx","di","si");
137c137
< 					);
---
> 					:"cx","di");
144c144
< 				"movl video_num_columns,%%ecx\n\t"
---
> 				"movl _video_num_columns,%%ecx\n\t"
151c151
< 				);
---
> 				:"cx","di","si");
159c159
< 			"movl video_num_columns,%%ecx\n\t"
---
> 			"movl _video_num_columns,%%ecx\n\t"
166c166
< 			);
---
> 			:"cx","di","si");
178c178
< 			"movl video_num_columns,%%ecx\n\t"
---
> 			"movl _video_num_columns,%%ecx\n\t"
185c185
< 			);
---
> 			:"ax","cx","di","si");
193c193
< 			"movl video_num_columns,%%ecx\n\t"
---
> 			"movl _video_num_columns,%%ecx\n\t"
200c200
< 			);
---
> 			:"ax","cx","di","si");
241,242c241,242
< 	long count;
< 	long start;
---
> 	long count __asm__("cx");
> 	long start __asm__("di");
265c265
< 		);
---
> 		:"cx","di");
270,271c270,271
< 	long count;
< 	long start;
---
> 	long count __asm__("cx");
> 	long start __asm__("di");
296c296
< 		);
---
> 		:"cx","di");
461c461
< 					__asm__("movb attr,%%ah\n\t"
---
> 					__asm__("movb _attr,%%ah\n\t"
464c464
< 						);
---
> 						:"ax");
515c515
< 				if ((ques=(c=='?')))
---
> 				if (ques=(c=='?'))
diff -r linux/kernel/chr_drv/keyboard.S linux.org/kernel/chr_drv/keyboard.S
16c16
< .globl keyboard_interrupt
---
> .globl _keyboard_interrupt
37c37
< keyboard_interrupt:
---
> _keyboard_interrupt:
47c47
< 	xor %al,%al		/* %eax is scan code */
---
> 	xorl %al,%al		/* %eax is scan code */
69c69
< 	call do_tty_interrupt
---
> 	call _do_tty_interrupt
91c91
< 	movl table_list,%edx		# read-queue for console
---
> 	movl _table_list,%edx		# read-queue for console
214c214
< 	call show_stat
---
> 	call _show_stat
diff -r linux/kernel/chr_drv/Makefile linux.org/kernel/chr_drv/Makefile
9,11c9,11
< AR	=ar
< AS	=as
< LD	=ld
---
> AR	=gar
> AS	=gas
> LD	=gld
13,15c13,15
< CC	=gcc -mcpu=i386
< CFLAGS	=-Wall -O -fstrength-reduce -fomit-frame-pointer \
< 	-finline-functions -nostdinc -I../../include
---
> CC	=gcc
> CFLAGS	=-Wall -O -fstrength-reduce -fomit-frame-pointer -fcombine-regs \
> 	-finline-functions -mstring-insns -nostdinc -I../../include
22c22
< 	$(AS) -o $*.o $<
---
> 	$(AS) -c -o $*.o $<
48c48
< console.s console.o: console.c ../../include/linux/sched.h \
---
> console.s console.o : console.c ../../include/linux/sched.h \
50,54c50,53
<   ../../include/sys/types.h ../../include/linux/mm.h \
<   ../../include/signal.h ../../include/linux/tty.h \
<   ../../include/termios.h ../../include/asm/io.h \
<   ../../include/asm/system.h
< serial.s serial.o: serial.c ../../include/linux/tty.h ../../include/termios.h \
---
>   ../../include/sys/types.h ../../include/linux/mm.h ../../include/signal.h \
>   ../../include/linux/tty.h ../../include/termios.h ../../include/asm/io.h \
>   ../../include/asm/system.h