linux-0.11-040327-rh9.diff

LINUX的0.11YU REDHAT9.2配置区别

> serial.s serial.o : serial.c ../../include/linux/tty.h ../../include/termios.h \
56,59c55,57
<   ../../include/linux/fs.h ../../include/sys/types.h \
<   ../../include/linux/mm.h ../../include/signal.h \
<   ../../include/asm/system.h ../../include/asm/io.h
< tty_io.s tty_io.o: tty_io.c ../../include/ctype.h ../../include/errno.h \
---
>   ../../include/linux/fs.h ../../include/sys/types.h ../../include/linux/mm.h \
>   ../../include/signal.h ../../include/asm/system.h ../../include/asm/io.h 
> tty_io.s tty_io.o : tty_io.c ../../include/ctype.h ../../include/errno.h \
62,65c60,63
<   ../../include/linux/fs.h ../../include/linux/mm.h \
<   ../../include/linux/tty.h ../../include/termios.h \
<   ../../include/asm/segment.h ../../include/asm/system.h
< tty_ioctl.s tty_ioctl.o: tty_ioctl.c ../../include/errno.h ../../include/termios.h \
---
>   ../../include/linux/fs.h ../../include/linux/mm.h ../../include/linux/tty.h \
>   ../../include/termios.h ../../include/asm/segment.h \
>   ../../include/asm/system.h 
> tty_ioctl.s tty_ioctl.o : tty_ioctl.c ../../include/errno.h ../../include/termios.h \
67,71c65,68
<   ../../include/linux/fs.h ../../include/sys/types.h \
<   ../../include/linux/mm.h ../../include/signal.h \
<   ../../include/linux/kernel.h ../../include/linux/tty.h \
<   ../../include/asm/io.h ../../include/asm/segment.h \
<   ../../include/asm/system.h
---
>   ../../include/linux/fs.h ../../include/sys/types.h ../../include/linux/mm.h \
>   ../../include/signal.h ../../include/linux/kernel.h \
>   ../../include/linux/tty.h ../../include/asm/io.h \
>   ../../include/asm/segment.h ../../include/asm/system.h 
diff -r linux/kernel/chr_drv/rs_io.s linux.org/kernel/chr_drv/rs_io.s
14c14
< .globl rs1_interrupt,rs2_interrupt
---
> .globl _rs1_interrupt,_rs2_interrupt
34,35c34,35
< rs1_interrupt:
< 	pushl $table_list+8
---
> _rs1_interrupt:
> 	pushl $_table_list+8
38,39c38,39
< rs2_interrupt:
< 	pushl $table_list+16
---
> _rs2_interrupt:
> 	pushl $_table_list+16
98c98
< 	subl $table_list,%edx
---
> 	subl $_table_list,%edx
109c109
< 	call do_tty_interrupt
---
> 	call _do_tty_interrupt
diff -r linux/kernel/chr_drv/tty_io.c linux.org/kernel/chr_drv/tty_io.c
244c244
< 		if ((flag=(!oldalarm || time+jiffies<oldalarm)))
---
> 		if (flag=(!oldalarm || time+jiffies<oldalarm))
273,274c273,274
< 		if (time && !L_CANON(tty)) {
< 			if ((flag=(!oldalarm || time+jiffies<oldalarm)))
---
> 		if (time && !L_CANON(tty))
> 			if (flag=(!oldalarm || time+jiffies<oldalarm))
278d277
< 		}
293c292
< 	static int cr_flag=0;
---
> 	static cr_flag=0;
diff -r linux/kernel/exit.c linux.org/kernel/exit.c
67c67
< 			if ((err=send_sig(sig,*p,1)))
---
> 			if (err=send_sig(sig,*p,1))
71c71
< 			if ((err=send_sig(sig,*p,0)))
---
> 			if (err=send_sig(sig,*p,0))
73,74c73,74
< 	} else if (pid == -1) while (--p > &FIRST_TASK) {
< 		if ((err = send_sig(sig,*p,0)))
---
> 	} else if (pid == -1) while (--p > &FIRST_TASK)
> 		if (err = send_sig(sig,*p,0))
76c76
< 	} else while (--p > &FIRST_TASK)
---
> 	else while (--p > &FIRST_TASK)
78c78
< 			if ((err = send_sig(sig,*p,0)))
---
> 			if (err = send_sig(sig,*p,0))
104a105
> 
diff -r linux/kernel/fork.c linux.org/kernel/fork.c
57d56
< 		printk("free_page_tables: from copy_mem\n");
122c121
< 		if ((f=p->filp[i]))
---
> 		if (f=p->filp[i])
diff -r linux/kernel/Makefile linux.org/kernel/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 $<
51c51
< exit.s exit.o: exit.c ../include/errno.h ../include/signal.h \
---
> exit.s exit.o : exit.c ../include/errno.h ../include/signal.h \
55,56c55,56
<   ../include/asm/segment.h
< fork.s fork.o: fork.c ../include/errno.h ../include/linux/sched.h \
---
>   ../include/asm/segment.h 
> fork.s fork.o : fork.c ../include/errno.h ../include/linux/sched.h \
59,61c59,61
<   ../include/asm/segment.h ../include/asm/system.h
< mktime.s mktime.o: mktime.c ../include/time.h
< panic.s panic.o: panic.c ../include/linux/kernel.h ../include/linux/sched.h \
---
>   ../include/asm/segment.h ../include/asm/system.h 
> mktime.s mktime.o : mktime.c ../include/time.h 
> panic.s panic.o : panic.c ../include/linux/kernel.h ../include/linux/sched.h \
63,66c63,66
<   ../include/linux/mm.h ../include/signal.h
< printk.s printk.o: printk.c ../include/stdarg.h ../include/stddef.h \
<   ../include/linux/kernel.h
< sched.s sched.o: sched.c ../include/linux/sched.h ../include/linux/head.h \
---
>   ../include/linux/mm.h ../include/signal.h 
> printk.s printk.o : printk.c ../include/stdarg.h ../include/stddef.h \
>   ../include/linux/kernel.h 
> sched.s sched.o : sched.c ../include/linux/sched.h ../include/linux/head.h \
70,71c70,71
<   ../include/asm/segment.h
< signal.s signal.o: signal.c ../include/linux/sched.h ../include/linux/head.h \
---
>   ../include/asm/segment.h 
> signal.s signal.o : signal.c ../include/linux/sched.h ../include/linux/head.h \
73,74c73,74
<   ../include/signal.h ../include/linux/kernel.h ../include/asm/segment.h
< sys.s sys.o: sys.c ../include/errno.h ../include/linux/sched.h \
---
>   ../include/signal.h ../include/linux/kernel.h ../include/asm/segment.h 
> sys.s sys.o : sys.c ../include/errno.h ../include/linux/sched.h \
78,79c78,79
<   ../include/sys/times.h ../include/sys/utsname.h
< traps.s traps.o: traps.c ../include/string.h ../include/linux/head.h \
---
>   ../include/sys/times.h ../include/sys/utsname.h 
> traps.s traps.o : traps.c ../include/string.h ../include/linux/head.h \
82,83c82,83
<   ../include/asm/system.h ../include/asm/segment.h ../include/asm/io.h
< vsprintf.s vsprintf.o: vsprintf.c ../include/stdarg.h ../include/string.h
---
>   ../include/asm/system.h ../include/asm/segment.h ../include/asm/io.h 
> vsprintf.s vsprintf.o : vsprintf.c ../include/stdarg.h ../include/string.h 
diff -r linux/kernel/math/Makefile linux.org/kernel/math/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 $<
diff -r linux/kernel/panic.c linux.org/kernel/panic.c
11,12d10
< #define PANIC
< 
diff -r linux/kernel/printk.c linux.org/kernel/printk.c
33c33
< 		"pushl $buf\n\t"
---
> 		"pushl $_buf\n\t"
35c35
< 		"call tty_write\n\t"
---
> 		"call _tty_write\n\t"
diff -r linux/kernel/system_call.s linux.org/kernel/system_call.s
67,69c67,69
< .globl system_call,sys_fork,timer_interrupt,sys_execve
< .globl hd_interrupt,floppy_interrupt,parallel_interrupt
< .globl device_not_available, coprocessor_error
---
> .globl _system_call,_sys_fork,_timer_interrupt,_sys_execve
> .globl _hd_interrupt,_floppy_interrupt,_parallel_interrupt
> .globl _device_not_available, _coprocessor_error
78c78
< 	jmp schedule
---
> 	jmp _schedule
80c80
< system_call:
---
> _system_call:
94c94
< 	call sys_call_table(,%eax,4)
---
> 	call _sys_call_table(,%eax,4)
96c96
< 	movl current,%eax
---
> 	movl _current,%eax
102,103c102,103
< 	movl current,%eax		# task[0] cannot have signals
< 	cmpl task,%eax
---
> 	movl _current,%eax		# task[0] cannot have signals
> 	cmpl _task,%eax
119c119
< 	call do_signal
---
> 	call _do_signal
131c131
< coprocessor_error:
---
> _coprocessor_error:
145c145
< 	jmp math_error
---
> 	jmp _math_error
148c148
< device_not_available:
---
> _device_not_available:
165c165
< 	je math_state_restore
---
> 	je _math_state_restore
169c169
< 	call math_emulate
---
> 	call _math_emulate
176c176
< timer_interrupt:
---
> _timer_interrupt:
189c189
< 	incl jiffies
---
> 	incl _jiffies
195c195
< 	call do_timer		# 'do_timer(long CPL)' does everything from
---
> 	call _do_timer		# 'do_timer(long CPL)' does everything from
200c200
< sys_execve:
---
> _sys_execve:
203c203
< 	call do_execve
---
> 	call _do_execve
208,209c208,209
< sys_fork:
< 	call find_empty_process
---
> _sys_fork:
> 	call _find_empty_process
217c217
< 	call copy_process
---
> 	call _copy_process
221c221
< hd_interrupt:
---
> _hd_interrupt:
238c238
< 	xchgl do_hd,%edx
---
> 	xchgl _do_hd,%edx
241c241
< 	movl $unexpected_hd_interrupt,%edx
---
> 	movl $_unexpected_hd_interrupt,%edx
252c252
< floppy_interrupt:
---
> _floppy_interrupt:
267c267
< 	xchgl do_floppy,%eax
---
> 	xchgl _do_floppy,%eax
270c270
< 	movl $unexpected_floppy_interrupt,%eax
---
> 	movl $_unexpected_floppy_interrupt,%eax
280c280
< parallel_interrupt:
---
> _parallel_interrupt:
diff -r linux/kernel/traps.c linux.org/kernel/traps.c
13c13
< #include <string.h> 
---
> #include <string.h>
diff -r linux/kernel/vsprintf.c linux.org/kernel/vsprintf.c
13c13
< #include <string.h> 
---
> #include <string.h>
58c58
< 	if (type&SPECIAL) {
---
> 	if (type&SPECIAL)
61d60
< 	}
74c73
< 	if (type&SPECIAL) {
---
> 	if (type&SPECIAL)
81d79
< 	}
diff -r linux/lib/Makefile linux.org/lib/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 $<
diff -r linux/lib/malloc.c linux.org/lib/malloc.c
187c187
< 	bdesc = prev = 0;
---
> 
diff -r linux/Makefile linux.org/Makefile
5c5
< RAMDISK =  #-DRAMDISK=512
---
> RAMDISK = #-DRAMDISK=512
10,15c10,15
< AS	=as
< LD	=ld
< LDFLAGS	=-m elf_i386 -Ttext 0 -e startup_32
< CC	=gcc -mcpu=i386 $(RAMDISK)
< CFLAGS	=-Wall -O2 -fomit-frame-pointer 
< 
---
> AS	=gas
> LD	=gld
> LDFLAGS	=-s -x -M
> CC	=gcc $(RAMDISK)
> CFLAGS	=-Wall -O -fstrength-reduce -fomit-frame-pointer \
> -fcombine-regs -mstring-insns
23c23
< ROOT_DEV= #FLOPPY 
---
> ROOT_DEV=/dev/hd6
34c34
< 	$(AS)  -o $*.o $<
---
> 	$(AS) -c -o $*.o $<
42,44c42
< 	objcopy -O binary -R .note -R .comment tools/system tools/kernel
< 	tools/build boot/bootsect boot/setup tools/kernel $(ROOT_DEV) > Image
< 	rm tools/kernel -f
---
> 	tools/build boot/bootsect boot/setup tools/system $(ROOT_DEV) > Image
48c46
< 	dd bs=8192 if=Image of=/dev/fd0
---
> 	dd bs=8192 if=Image of=/dev/PS0
55,56d52
< 	gcc -I./include -traditional -c boot/head.s
< 	mv head.o boot/
65,66c61
< 	-o tools/system 
< 	nm tools/system | grep -v '\(compiled\)\|\(\.o$$\)\|\( [aU] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)'| sort > System.map 
---
> 	-o tools/system > System.map
111c106
< 	(cd .. ; tar cf - linux | compress16 - > backup.Z)
---
> 	(cd .. ; tar cf - linux | compress - > backup.Z)
123c118
< init/main.o: init/main.c include/unistd.h include/sys/stat.h \
---
> init/main.o : init/main.c include/unistd.h include/sys/stat.h \
127,128c122,123
<   include/linux/mm.h include/signal.h include/asm/system.h \
<   include/asm/io.h include/stddef.h include/stdarg.h include/fcntl.h
---
>   include/linux/mm.h include/signal.h include/asm/system.h include/asm/io.h \
>   include/stddef.h include/stdarg.h include/fcntl.h 
diff -r linux/mm/Makefile linux.org/mm/Makefile
1,2c1,2
< CC	=gcc -mcpu=i386
< CFLAGS	=-Wall -O -fstrength-reduce -fomit-frame-pointer \
---
> CC	=gcc
> CFLAGS	=-O -Wall -fstrength-reduce -fcombine-regs -fomit-frame-pointer \
4,6c4,6
< AS	=as
< AR	=ar
< LD	=ld
---
> AS	=gas
> AR	=gar
> LD	=gld
35,38c35,37
< memory.o: memory.c ../include/signal.h ../include/sys/types.h \
<   ../include/asm/system.h ../include/linux/sched.h \
<   ../include/linux/head.h ../include/linux/fs.h ../include/linux/mm.h \
<   ../include/linux/kernel.h
---
> memory.o : memory.c ../include/signal.h ../include/sys/types.h \
>   ../include/asm/system.h ../include/linux/sched.h ../include/linux/head.h \
>   ../include/linux/fs.h ../include/linux/mm.h ../include/linux/kernel.h 
diff -r linux/mm/memory.c linux.org/mm/memory.c
55c55
< __asm__("cld ; rep ; movsl"::"S" (from),"D" (to),"c" (1024))
---
> __asm__("cld ; rep ; movsl"::"S" (from),"D" (to),"c" (1024):"cx","di","si")
81c81
< 	);
---
> 	:"di","cx","dx");
317,318c317,318
< 	if (!(to & 1)) {
< 		if ((to = get_free_page()))
---
> 	if (!(to & 1))
> 		if (to = get_free_page())
322d321
< 	}
diff -r linux/mm/page.s linux.org/mm/page.s
12c12
< .globl page_fault
---
> .globl _page_fault
14c14
< page_fault:
---
> _page_fault:
30c30
< 	call do_no_page
---
> 	call _do_no_page
32c32
< 1:	call do_wp_page
---
> 1:	call _do_wp_page
diff -r linux/tools/build.c linux.org/tools/build.c
35c35
< #define SYS_SIZE 0x3000
---
> #define SYS_SIZE 0x2000
37,38c37,38
< #define DEFAULT_MAJOR_ROOT 2
< #define DEFAULT_MINOR_ROOT 0x1d
---
> #define DEFAULT_MAJOR_ROOT 3
> #define DEFAULT_MINOR_ROOT 6
156,159c156,159
< //	if (read(id,buf,GCC_HEADER) != GCC_HEADER)
< //		die("Unable to read header of 'system'");
< //	if (((long *) buf)[5] != 0)
< //		die("Non-GCC header of 'system'");
---
> 	if (read(id,buf,GCC_HEADER) != GCC_HEADER)
> 		die("Unable to read header of 'system'");
> 	if (((long *) buf)[5] != 0)
> 		die("Non-GCC header of 'system'");