1 diff -Nru a/arch/ppc/8260_io/uart.c b/arch/ppc/8260_io/uart.c
2 --- a/arch/ppc/8260_io/uart.c Wed Jun 11 12:32:53 2003
3 +++ b/arch/ppc/8260_io/uart.c Thu Aug 21 16:54:31 2003
5 #include <asm/cpm_8260.h>
8 +#ifdef CONFIG_MAGIC_SYSRQ
9 +#include <linux/sysrq.h>
12 #ifdef CONFIG_SERIAL_CONSOLE
13 #include <linux/console.h>
16 static struct tty_driver *serial_driver;
17 static int serial_console_setup(struct console *co, char *options);
19 +static void serial_console_write(struct console *c, const char *s,
21 +static kdev_t serial_console_device(struct console *c);
23 +#if defined(CONFIG_SERIAL_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
24 +static unsigned long break_pressed; /* break, really ... */
28 * Serial driver configuration section. Here are the various options:
34 +static struct console sercons = {
36 + .write = serial_console_write,
37 + .device = serial_console_device,
38 + .setup = serial_console_setup,
39 + .flags = CON_PRINTBUFFER,
40 + .index = CONFIG_SERIAL_CONSOLE_PORT,
43 static void change_speed(ser_info_t *info);
44 static void rs_8xx_wait_until_sent(struct tty_struct *tty, int timeout);
47 schedule_work(&info->tqueue);
50 -static _INLINE_ void receive_chars(ser_info_t *info)
51 +static _INLINE_ void receive_chars(ser_info_t *info, struct pt_regs *regs)
53 struct tty_struct *tty = info->tty;
54 unsigned char ch, *cp;
60 +#if defined(CONFIG_SERIAL_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
61 + if (break_pressed && info->line == sercons.index) {
62 + if (ch != 0 && time_before(jiffies,
63 + break_pressed + HZ*5)) {
64 + handle_sysrq(ch, regs, NULL, NULL);
72 if (tty->flip.count >= TTY_FLIPBUF_SIZE)
79 +#if defined(CONFIG_SERIAL_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
83 /* This BD is ready to be used again. Clear status.
87 schedule_delayed_work(&tty->flip.work, 1);
90 -static _INLINE_ void transmit_chars(ser_info_t *info)
91 +static _INLINE_ void receive_break(ser_info_t *info, struct pt_regs *regs)
93 + struct tty_struct *tty = info->tty;
95 + info->state->icount.brk++;
97 +#if defined(CONFIG_SERIAL_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
98 + if (info->line == sercons.index) {
99 + if (!break_pressed) {
100 + break_pressed = jiffies;
107 + /* Check to see if there is room in the tty buffer for
108 + * the break. If not, we exit now, losing the break. FIXME
110 + if ((tty->flip.count + 1) >= TTY_FLIPBUF_SIZE)
112 + *(tty->flip.flag_buf_ptr++) = TTY_BREAK;
113 + *(tty->flip.char_buf_ptr++) = 0;
116 + queue_task(&tty->flip.tqueue, &tq_timer);
120 +static _INLINE_ void transmit_chars(ser_info_t *info, struct pt_regs *regs)
123 if (info->flags & TX_WAKEUP) {
124 @@ -575,19 +642,23 @@
125 if ((idx = info->state->smc_scc_num) < SCC_NUM_BASE) {
126 smcp = &immr->im_smc[idx];
127 events = smcp->smc_smce;
128 + if (events & SMCM_BRKE)
129 + receive_break(info, regs);
130 if (events & SMCM_RX)
131 - receive_chars(info);
132 + receive_chars(info, regs);
133 if (events & SMCM_TX)
134 - transmit_chars(info);
135 + transmit_chars(info, regs);
136 smcp->smc_smce = events;
139 sccp = &immr->im_scc[idx - SCC_IDX_BASE];
140 events = sccp->scc_scce;
141 + if (events & SMCM_BRKE)
142 + receive_break(info, regs);
143 if (events & SCCM_RX)
144 - receive_chars(info);
145 + receive_chars(info, regs);
146 if (events & SCCM_TX)
147 - transmit_chars(info);
148 + transmit_chars(info, regs);
149 sccp->scc_scce = events;
152 @@ -2207,7 +2278,7 @@
153 static void serial_console_write(struct console *c, const char *s,
156 -#if defined(CONFIG_KGDB) && !defined(CONFIG_USE_SERIAL2_KGDB)
157 +#if defined(CONFIG_KGDB_CONSOLE) && !defined(CONFIG_USE_SERIAL2_KGDB)
158 /* Try to let stub handle output. Returns true if it did. */
159 if (kgdb_output_string(s, count))
161 @@ -2396,16 +2467,6 @@
163 return serial_driver;
167 -static struct console sercons = {
169 - .write = serial_console_write,
170 - .device = serial_console_device,
171 - .setup = serial_console_setup,
172 - .flags = CON_PRINTBUFFER,
173 - .index = CONFIG_SERIAL_CONSOLE_PORT,
178 diff -Nru a/arch/ppc/8xx_io/uart.c b/arch/ppc/8xx_io/uart.c
179 --- a/arch/ppc/8xx_io/uart.c Wed Jun 11 12:32:54 2003
180 +++ b/arch/ppc/8xx_io/uart.c Thu Aug 21 15:10:37 2003
181 @@ -1068,7 +1068,7 @@
186 +#ifdef CONFIG_KGDB_CONSOLE
187 /* Try to let stub handle output. Returns true if it did. */
188 if (kgdb_output_string(buf, count))
190 @@ -2271,7 +2271,7 @@
191 static void serial_console_write(struct console *c, const char *s,
195 +#ifdef CONFIG_KGDB_CONSOLE
196 /* Try to let stub handle output. Returns true if it did. */
197 if (kgdb_output_string(s, count))
199 diff -Nru a/arch/ppc/Kconfig b/arch/ppc/Kconfig
200 --- a/arch/ppc/Kconfig Mon Aug 4 16:10:57 2003
201 +++ b/arch/ppc/Kconfig Thu Aug 21 15:10:37 2003
202 @@ -1426,20 +1426,12 @@
204 bool "Include kgdb kernel debugger"
205 depends on DEBUG_KERNEL
208 Include in-kernel hooks for kgdb, the Linux kernel source level
209 debugger. See <http://kgdb.sourceforge.net/> for more information.
210 Unless you are intending to debug the kernel, say N here.
213 - bool "Compile the kernel with debug info"
214 - depends on DEBUG_KERNEL
216 - If you say Y here the resulting kernel image will include
217 - debugging info resulting in a larger kernel image.
218 - Say Y here only if you plan to use gdb to debug the kernel.
219 - If you don't debug the kernel, you can say N.
224 @@ -1459,6 +1451,14 @@
229 + bool "Enable serial console thru kgdb port"
230 + depends on KGDB && 8xx || 8260
232 + If you enable this, all serial console messages will be sent
237 bool "Include xmon kernel debugger"
238 depends on DEBUG_KERNEL
239 @@ -1474,18 +1474,16 @@
240 Unless you are intending to debug the kernel with one of these
241 machines, say N here.
243 -config MORE_COMPILE_OPTIONS
244 - bool "Add any additional compile options"
245 - depends on DEBUG_KERNEL && (KGDB || XMON || BDI_SWITCH)
247 + bool "Compile the kernel with debug info"
248 + depends on DEBUG_KERNEL
249 + default y if BDI_SWITCH || XMON
251 - If you want to add additional CFLAGS to the kernel build, such as -g
252 - for KGDB or the BDI2000, enable this option and then enter what you
253 - would like to add in the next question.
255 -config COMPILE_OPTIONS
256 - string "Additional compile arguments"
257 - depends on MORE_COMPILE_OPTIONS
259 + If you say Y here the resulting kernel image will include
260 + debugging info resulting in a larger kernel image.
261 + Say Y here only if you plan to use some sort of debugger to
263 + If you don't debug the kernel, you can say N.
266 bool "Support for early boot text console (BootX or OpenFirmware only)"
267 diff -Nru a/arch/ppc/Makefile b/arch/ppc/Makefile
268 --- a/arch/ppc/Makefile Sun Jul 27 15:52:30 2003
269 +++ b/arch/ppc/Makefile Thu Aug 21 15:10:37 2003
272 cflags-$(CONFIG_4xx) += -Wa,-m405
273 cflags-$(CONFIG_PPC64BRIDGE) += -Wa,-mppc64bridge
274 -# Use sed to remove the quotes.
275 -cflags-$(CONFIG_MORE_COMPILE_OPTIONS) += \
276 - $(shell echo $(CONFIG_COMPILE_OPTIONS) | sed -e 's/"//g')
278 CFLAGS += $(cflags-y)
280 diff -Nru a/arch/ppc/boot/common/ns16550.c b/arch/ppc/boot/common/ns16550.c
281 --- a/arch/ppc/boot/common/ns16550.c Sat Jun 28 11:06:53 2003
282 +++ b/arch/ppc/boot/common/ns16550.c Wed Aug 20 10:24:16 2003
286 outb(com_port + (UART_DLL << shift),
287 - (BASE_BAUD / SERIAL_BAUD));
288 + (BASE_BAUD / SERIAL_BAUD) & 0xFF);
289 outb(com_port + (UART_DLM << shift),
290 (BASE_BAUD / SERIAL_BAUD) >> 8);
291 /* 8 data, 1 stop, no parity */
292 diff -Nru a/arch/ppc/boot/common/util.S b/arch/ppc/boot/common/util.S
293 --- a/arch/ppc/boot/common/util.S Tue Feb 25 11:37:43 2003
294 +++ b/arch/ppc/boot/common/util.S Thu Aug 21 10:17:00 2003
299 +/* udelay (on non-601 processors) needs to know the period of the
300 + * timebase in nanoseconds. This used to be hardcoded to be 60ns
301 + * (period of 66MHz/4). Now a variable is used that is initialized to
302 + * 60 for backward compatibility, but it can be overridden as necessary
303 + * with code something like this:
304 + * extern unsigned long timebase_period_ns;
305 + * timebase_period_ns = 1000000000 / bd->bi_tbfreq;
308 + .globl timebase_period_ns
314 * Delay for a number of microseconds
315 - * -- Use the BUS timer (assumes 66MHz)
322 mulli r4,r3,1000 /* nanoseconds */
325 + /* Change r4 to be the number of ticks using:
326 + * (nanoseconds + (timebase_period_ns - 1 )) / timebase_period_ns
327 + * timebase_period_ns defaults to 60 (16.6MHz) */
328 + lis r5,timebase_period_ns@h
329 + lwz r5,timebase_period_ns@l(r5)
332 divw r4,r4,r5 /* BUS ticks */
335 diff -Nru a/arch/ppc/boot/simple/Makefile b/arch/ppc/boot/simple/Makefile
336 --- a/arch/ppc/boot/simple/Makefile Tue Jul 1 17:01:18 2003
337 +++ b/arch/ppc/boot/simple/Makefile Mon Aug 18 09:44:01 2003
339 # get_mem_size(), which is memory controller dependent. Add in the correct
340 # XXX_memory.o file for this to work, as well as editing the $(MISC) file.
344 boot := arch/ppc/boot
345 common := $(boot)/common
348 # Normally, we use the 'misc.c' file for decompress_kernel and
349 # whatnot. Sometimes we need to override this however.
351 -ifeq ($(CONFIG_IBM_OPENBIOS),y)
352 -ZIMAGE := zImage-TREE
353 -ZIMAGEINITRD := zImage.initrd-TREE
355 -TFTPIMAGE := /tftpboot/zImage.$(END)
356 -MISC := misc-embedded.o
358 -ifeq ($(CONFIG_EMBEDDEDBOOT),y)
359 -TFTPIMAGE := /tftpboot/zImage.embedded
360 -MISC := misc-embedded.o
362 -ifeq ($(CONFIG_EBONY),y)
363 -ZIMAGE := zImage-TREE
364 -ZIMAGEINITRD := zImage.initrd-TREE
366 -ENTRYPOINT := 0x01000000
367 -TFTPIMAGE := /tftpboot/zImage.$(END)
369 -ifeq ($(CONFIG_EV64260),y)
370 -EXTRA := misc-ev64260.o
371 -TFTPIMAGE := /tftpboot/zImage.ev64260
373 -ifeq ($(CONFIG_GEMINI),y)
374 -ZIMAGE := zImage-STRIPELF
375 -ZIMAGEINITRD := zImage.initrd-STRIPELF
377 -TFTPIMAGE := /tftpboot/zImage.$(END)
379 -ifeq ($(CONFIG_K2),y)
381 -TFTPIMAGE := /tftpboot/zImage.k2
383 -# kbuild-2.4 'feature', only one of these will ever by 'y' at a time.
387 +# See arch/ppc/kconfig and arch/ppc/platforms/Kconfig
388 +# for definition of what platform each config option refer to.
389 +#----------------------------------------------------------------------------
390 + zimage-$(CONFIG_IBM_OPENBIOS) := zImage-TREE
391 +zimageinitrd-$(CONFIG_IBM_OPENBIOS) := zImage.initrd-TREE
392 + end-$(CONFIG_IBM_OPENBIOS) := treeboot
393 + tftpimage-$(CONFIG_IBM_OPENBIOS) := /tftpboot/zImage.$(end-y)
394 + misc-$(CONFIG_IBM_OPENBIOS) := misc-embedded.o
396 + tftpimage-$(CONFIG_EMBEDDEDBOOT) := /tftpboot/zImage.embedded
397 + misc-$(CONFIG_EMBEDDEDBOOT) := misc-embedded.o
399 + zimage-$(CONFIG_EBONY) := zImage-TREE
400 +zimageinitrd-$(CONFIG_EBONY) := zImage.initrd-TREE
401 + extra.o-$(CONFIG_EBONY) := direct.o
402 + end-$(CONFIG_EBONY) := ebony
403 + entrypoint-$(CONFIG_EBONY) := 0x01000000
404 + tftpimage-$(CONFIG_EBONY) := /tftpboot/zImage.$(end-y)
406 + extra.o-$(CONFIG_EV64260) := direct.o misc-ev64260.o
407 + tftpimage-$(CONFIG_EV64260) := /tftpboot/zImage.ev64260
409 + zimage-$(CONFIG_GEMINI) := zImage-STRIPELF
410 +zimageinitrd-$(CONFIG_GEMINI) := zImage.initrd-STRIPELF
411 + end-$(CONFIG_GEMINI) := gemini
412 + tftpimage-$(CONFIG_GEMINI) := /tftpboot/zImage.$(end-y)
414 + extra.o-$(CONFIG_K2) := legacy.o
415 + tftpimage-$(CONFIG_K2) := /tftpboot/zImage.k2
417 +# kconfig 'feature', only one of these will ever by 'y' at a time.
418 # The rest will be unset.
419 -ifeq ($(CONFIG_MCPN765)$(CONFIG_MVME5100)$(CONFIG_PRPMC750)$(CONFIG_PRPMC800)$(CONFIG_LOPEC)$(CONFIG_PPLUS),y)
420 -ZIMAGE := zImage-PPLUS
421 -ZIMAGEINITRD := zImage.initrd-PPLUS
422 -TFTPIMAGE := /tftpboot/zImage.pplus
423 -ZNETBOOT := zImage.pplus
424 -ZNETBOOTRD := zImage.initrd.pplus
426 -ifeq ($(CONFIG_PPLUS),y)
429 -ifeq ($(CONFIG_PCORE)$(CONFIG_POWERPMC250),y)
430 -ZIMAGE := zImage-STRIPELF
431 -ZIMAGEINITRD := zImage.initrd-STRIPELF
434 -TFTPIMAGE := /tftpboot/zImage.$(END)
436 -ifeq ($(CONFIG_SANDPOINT),y)
437 -TFTPIMAGE := /tftpboot/zImage.sandpoint
439 -ifeq ($(CONFIG_SPRUCE),y)
440 -ZIMAGE := zImage-TREE
441 -ZIMAGEINITRD := zImage.initrd-TREE
443 -ENTRYPOINT := 0x00800000
444 -MISC := misc-spruce.o
445 -TFTPIMAGE := /tftpboot/zImage.$(END)
447 -ifeq ($(CONFIG_SMP),y)
450 -ifeq ($(CONFIG_REDWOOD_4),y)
451 +multi := $(CONFIG_MCPN765)$(CONFIG_MVME5100)$(CONFIG_PRPMC750) \
452 +$(CONFIG_PRPMC800)$(CONFIG_LOPEC)$(CONFIG_PPLUS)
453 + zimage-$(multi) := zImage-PPLUS
454 +zimageinitrd-$(multi) := zImage.initrd-PPLUS
455 + tftpimage-$(multi) := /tftpboot/zImage.pplus
456 + znetboot-$(multi) := zImage.pplus
457 + znetbootrd-$(multi) := zImage.initrd.pplus
459 +# Overrides previous assingment
460 + extra.o-$(CONFIG_PPLUS) := legacy.o
462 + zimage-$(CONFIG_PCORE) := zImage-STRIPELF
463 +zimageinitrd-$(CONFIG_PCORE) := zImage.initrd-STRIPELF
464 + extra.o-$(CONFIG_PCORE) := chrpmap.o
465 + end-$(CONFIG_PCORE) := pcore
466 + tftpimage-$(CONFIG_PCORE) := /tftpboot/zImage.$(end-y)
468 + zimage-$(CONFIG_POWERPMC250) := zImage-STRIPELF
469 +zimageinitrd-$(CONFIG_POWERPMC250) := zImage.initrd-STRIPELF
470 + extra.o-$(CONFIG_POWERPMC250) := chrpmap.o
471 + end-$(CONFIG_POWERPMC250) := pcore
472 + tftpimage-$(CONFIG_POWERPMC250) := /tftpboot/zImage.$(end-y)
474 + tftpimage-$(CONFIG_SANDPOINT) := /tftpboot/zImage.sandpoint
476 + zimage-$(CONFIG_SPRUCE) := zImage-TREE
477 +zimageinitrd-$(CONFIG_SPRUCE) := zImage.initrd-TREE
478 + end-$(CONFIG_SPRUCE) := spruce
479 + entrypoint-$(CONFIG_SPRUCE) := 0x00800000
480 + misc-$(CONFIG_SPRUCE) := misc-spruce.o
481 + tftpimage-$(CONFIG_SPRUCE) := /tftpboot/zImage.$(end-y)
484 +# tftp image is prefixed with .smp if compiled for SMP
485 +tftpimage-$(CONFIG_SMP) += .smp
487 # This is a treeboot that needs init functions until the
488 # boot rom is sorted out (i.e. this is short lived)
489 -EXTRA_AFLAGS := -Wa,-m405
490 -EXTRA := rw4/rw4_init.o rw4/rw4_init_brd.o
492 +extra-aflags-$(CONFIG_REDWOOD_4) := -Wa,-m405
493 +extra.o-$(CONFIG_REDWOOD_4) := rw4/rw4_init.o rw4/rw4_init_brd.o
494 +EXTRA_AFLAGS := $(extra-aflags-y)
496 # Linker args. This specifies where the image will be run at.
497 -LD_ARGS = -T $(boot)/ld.script \
498 - -Ttext $(CONFIG_BOOT_LOAD) -Bstatic
499 +LD_ARGS := -T $(boot)/ld.script \
500 + -Ttext $(CONFIG_BOOT_LOAD) -Bstatic
501 OBJCOPY_ARGS := -O elf32-powerpc
503 # head.o and relocate.o must be at the start.
504 -boot-y := head.o relocate.o $(EXTRA) $(MISC)
505 +boot-y := head.o relocate.o $(extra.o-y) $(misc-y)
506 boot-$(CONFIG_40x) += embed_config.o
507 boot-$(CONFIG_8xx) += embed_config.o
508 boot-$(CONFIG_8260) += embed_config.o
509 @@ -160,40 +163,40 @@
510 -R .stabstr -R .sysmap
512 # Sort-of dummy rules, that let us format the image we want.
513 -zImage: $(images)/$(ZIMAGE) $(obj)/zvmlinux
514 +zImage: $(images)/$(zimage-y) $(obj)/zvmlinux
515 cp -f $(obj)/zvmlinux $(images)/zImage.elf
516 rm -f $(obj)/zvmlinux
518 -zImage.initrd: $(images)/$(ZIMAGEINITRD) $(obj)/zvmlinux.initrd
519 +zImage.initrd: $(images)/$(zimageinitrd-y) $(obj)/zvmlinux.initrd
520 cp -f $(obj)/zvmlinux.initrd $(images)/zImage.initrd.elf
521 rm -f $(obj)/zvmlinux.initrd
525 - cp $(images)/$(ZNETBOOT) $(TFTPIMAGE)
526 + cp $(images)/$(ZNETBOOT) $(tftpimage-y)
528 - cp $(images)/zImage.* $(TFTPIMAGE)
529 + cp $(images)/zImage.* $(tftpimage-y)
532 znetboot.initrd: zImage.initrd
533 -ifneq ($(ZNETBOOTRD),)
534 - cp $(images)/$(ZNETBOOTRD) $(TFTPIMAGE)
535 +ifneq ($(znetbootrd-y),)
536 + cp $(images)/$(znetbootrd-y) $(tftpimage-y)
538 - cp $(images)/zImage.* $(TFTPIMAGE)
539 + cp $(images)/zImage.* $(tftpimage-y)
542 $(images)/zImage-STRIPELF: $(obj)/zvmlinux
543 - dd if=$(obj)/zvmlinux of=$(images)/zImage.$(END) skip=64 bs=1k
544 + dd if=$(obj)/zvmlinux of=$(images)/zImage.$(end-y) skip=64 bs=1k
546 $(images)/zImage.initrd-STRIPELF: $(obj)/zvmlinux.initrd
547 - dd if=$(obj)/zvmlinux.initrd of=$(images)/zImage.initrd.$(END) \
548 + dd if=$(obj)/zvmlinux.initrd of=$(images)/zImage.initrd.$(end-y) \
551 $(images)/zImage-TREE: $(obj)/zvmlinux $(MKTREE)
552 - $(MKTREE) $(obj)/zvmlinux $(images)/zImage.$(END) $(ENTRYPOINT)
553 + $(MKTREE) $(obj)/zvmlinux $(images)/zImage.$(end-y) $(ENTRYPOINT)
555 $(images)/zImage.initrd-TREE: $(obj)/zvmlinux.initrd $(MKTREE)
556 - $(MKTREE) $(obj)/zvmlinux.initrd $(images)/zImage.initrd.$(END) \
557 + $(MKTREE) $(obj)/zvmlinux.initrd $(images)/zImage.initrd.$(end-y) \
560 $(images)/zImage-PPLUS: $(obj)/zvmlinux $(MKPREP) $(MKBUGBOOT)
561 diff -Nru a/arch/ppc/boot/simple/embed_config.c b/arch/ppc/boot/simple/embed_config.c
562 --- a/arch/ppc/boot/simple/embed_config.c Sat Mar 22 17:18:48 2003
563 +++ b/arch/ppc/boot/simple/embed_config.c Thu Aug 21 10:17:00 2003
568 +extern unsigned long timebase_period_ns;
570 /* For those boards that don't provide one.
573 #if defined(CONFIG_REDWOOD_5) || defined (CONFIG_REDWOOD_6)
574 bd->bi_tbfreq = 27 * 1000 * 1000;
576 + timebase_period_ns = 1000000000 / bd->bi_tbfreq;
578 #endif /* CONFIG_BEECH */
579 #endif /* CONFIG_IBM_OPENBIOS */
580 diff -Nru a/arch/ppc/boot/simple/misc-embedded.c b/arch/ppc/boot/simple/misc-embedded.c
581 --- a/arch/ppc/boot/simple/misc-embedded.c Thu Jun 5 18:06:12 2003
582 +++ b/arch/ppc/boot/simple/misc-embedded.c Wed Aug 20 15:44:31 2003
584 extern void embed_config(bd_t **bp);
587 -decompress_kernel(unsigned long load_addr, int num_words, unsigned long cksum, bd_t *bp)
588 +load_kernel(unsigned long load_addr, int num_words, unsigned long cksum, bd_t *bp)
591 int timer = 0, zimage_size;
592 diff -Nru a/arch/ppc/boot/simple/misc-spruce.c b/arch/ppc/boot/simple/misc-spruce.c
593 --- a/arch/ppc/boot/simple/misc-spruce.c Tue Feb 11 15:48:52 2003
594 +++ b/arch/ppc/boot/simple/misc-spruce.c Wed Aug 20 15:44:31 2003
596 #define MEM_B2EA 0x60
599 -decompress_kernel(unsigned long load_addr, int num_words, unsigned long cksum)
600 +load_kernel(unsigned long load_addr, int num_words, unsigned long cksum)
604 diff -Nru a/arch/ppc/boot/simple/misc.c b/arch/ppc/boot/simple/misc.c
605 --- a/arch/ppc/boot/simple/misc.c Tue Feb 11 15:48:52 2003
606 +++ b/arch/ppc/boot/simple/misc.c Wed Aug 20 15:44:31 2003
609 return (struct bi_record *)rec_loc;
612 +/* Allow decompress_kernel to be hooked into. This is the default. */
613 +void * __attribute__ ((weak))
614 +load_kernel(unsigned long load_addr, int num_words, unsigned long cksum)
616 + return decompress_kernel(load_addr, num_words, cksum);
618 diff -Nru a/arch/ppc/boot/simple/relocate.S b/arch/ppc/boot/simple/relocate.S
619 --- a/arch/ppc/boot/simple/relocate.S Tue Feb 11 15:48:52 2003
620 +++ b/arch/ppc/boot/simple/relocate.S Wed Aug 20 15:44:31 2003
622 mr r4,r7 /* Program length */
623 mr r5,r6 /* Checksum */
624 mr r6,r11 /* Residual data */
625 - bl decompress_kernel
629 * Make sure the kernel knows we don't have things set in
630 diff -Nru a/arch/ppc/boot/utils/mktree.c b/arch/ppc/boot/utils/mktree.c
631 --- a/arch/ppc/boot/utils/mktree.c Sun Sep 15 21:51:58 2002
632 +++ b/arch/ppc/boot/utils/mktree.c Thu Aug 21 15:00:42 2003
639 for (i=0; i<sizeof(bt)/sizeof(uint); i++)
642 diff -Nru a/arch/ppc/configs/common_defconfig b/arch/ppc/configs/common_defconfig
643 --- a/arch/ppc/configs/common_defconfig Sat Aug 2 13:06:57 2003
644 +++ b/arch/ppc/configs/common_defconfig Sat Aug 23 02:33:38 2003
646 # Code maturity level options
648 CONFIG_EXPERIMENTAL=y
649 +# CONFIG_BROKEN is not set
654 # CONFIG_BSD_PROCESS_ACCT is not set
656 CONFIG_LOG_BUF_SHIFT=14
658 +CONFIG_IKCONFIG_PROC=y
659 # CONFIG_EMBEDDED is not set
663 +CONFIG_IOSCHED_NOOP=y
665 +CONFIG_IOSCHED_DEADLINE=y
668 # Loadable module support
677 CONFIG_PCI_LEGACY_PROC=y
680 CONFIG_BOOT_LOAD=0x00800000
683 +# Generic Driver Options
685 +# CONFIG_FW_LOADER is not set
688 # Memory Technology Devices (MTD)
690 # CONFIG_MTD is not set
691 @@ -144,10 +156,12 @@
692 # CONFIG_BLK_DEV_DAC960 is not set
693 # CONFIG_BLK_DEV_UMEM is not set
694 CONFIG_BLK_DEV_LOOP=y
695 +# CONFIG_BLK_DEV_CRYPTOLOOP is not set
696 # CONFIG_BLK_DEV_NBD is not set
698 CONFIG_BLK_DEV_RAM_SIZE=4096
699 CONFIG_BLK_DEV_INITRD=y
703 # Multi-device support (RAID and LVM)
704 @@ -155,40 +169,38 @@
705 # CONFIG_MD is not set
708 -# ATA/IDE/MFM/RLL support
709 +# ATA/ATAPI/MFM/RLL support
714 -# IDE, ATA and ATAPI Block devices
719 # Please see Documentation/ide.txt for help/info on IDE drives
721 -# CONFIG_BLK_DEV_HD is not set
722 CONFIG_BLK_DEV_IDEDISK=y
723 # CONFIG_IDEDISK_MULTI_MODE is not set
724 # CONFIG_IDEDISK_STROKE is not set
725 CONFIG_BLK_DEV_IDECD=y
726 +# CONFIG_BLK_DEV_IDETAPE is not set
727 CONFIG_BLK_DEV_IDEFLOPPY=y
728 CONFIG_BLK_DEV_IDESCSI=y
729 # CONFIG_IDE_TASK_IOCTL is not set
730 +# CONFIG_IDE_TASKFILE_IO is not set
733 # IDE chipset support/bugfixes
735 CONFIG_BLK_DEV_IDEPCI=y
736 -CONFIG_BLK_DEV_GENERIC=y
737 CONFIG_IDEPCI_SHARE_IRQ=y
738 +# CONFIG_BLK_DEV_OFFBOARD is not set
739 +CONFIG_BLK_DEV_GENERIC=y
740 +# CONFIG_BLK_DEV_OPTI621 is not set
741 +CONFIG_BLK_DEV_SL82C105=y
742 CONFIG_BLK_DEV_IDEDMA_PCI=y
743 # CONFIG_BLK_DEV_IDE_TCQ is not set
744 -# CONFIG_BLK_DEV_OFFBOARD is not set
745 # CONFIG_BLK_DEV_IDEDMA_FORCED is not set
746 CONFIG_IDEDMA_PCI_AUTO=y
747 # CONFIG_IDEDMA_ONLYDISK is not set
748 -CONFIG_BLK_DEV_IDEDMA=y
749 # CONFIG_IDEDMA_PCI_WIP is not set
750 CONFIG_BLK_DEV_ADMA=y
751 # CONFIG_BLK_DEV_AEC62XX is not set
752 @@ -198,12 +210,12 @@
753 # CONFIG_BLK_DEV_TRIFLEX is not set
754 # CONFIG_BLK_DEV_CY82C693 is not set
755 # CONFIG_BLK_DEV_CS5520 is not set
756 +# CONFIG_BLK_DEV_CS5530 is not set
757 # CONFIG_BLK_DEV_HPT34X is not set
758 # CONFIG_BLK_DEV_HPT366 is not set
759 # CONFIG_BLK_DEV_SC1200 is not set
760 # CONFIG_BLK_DEV_PIIX is not set
761 # CONFIG_BLK_DEV_NS87415 is not set
762 -# CONFIG_BLK_DEV_OPTI621 is not set
763 # CONFIG_BLK_DEV_PDC202XX_OLD is not set
764 CONFIG_BLK_DEV_PDC202XX_NEW=y
765 # CONFIG_PDC202XX_FORCE is not set
766 @@ -212,15 +224,17 @@
767 # CONFIG_BLK_DEV_SLC90E66 is not set
768 # CONFIG_BLK_DEV_TRM290 is not set
769 # CONFIG_BLK_DEV_VIA82CXXX is not set
770 -CONFIG_BLK_DEV_SL82C105=y
771 CONFIG_BLK_DEV_IDE_PMAC=y
772 CONFIG_BLK_DEV_IDEDMA_PMAC=y
773 CONFIG_BLK_DEV_IDEDMA_PMAC_AUTO=y
774 -CONFIG_IDEDMA_AUTO=y
775 +CONFIG_BLK_DEV_IDEDMA=y
776 # CONFIG_IDEDMA_IVB is not set
777 +CONFIG_IDEDMA_AUTO=y
778 +# CONFIG_DMA_NONPCI is not set
779 +# CONFIG_BLK_DEV_HD is not set
783 +# SCSI device support
788 # CONFIG_SCSI_AIC79XX is not set
789 # CONFIG_SCSI_DPT_I2O is not set
790 CONFIG_SCSI_ADVANSYS=m
791 -# CONFIG_SCSI_IN2000 is not set
792 -# CONFIG_SCSI_AM53C974 is not set
793 # CONFIG_SCSI_MEGARAID is not set
794 # CONFIG_SCSI_BUSLOGIC is not set
795 # CONFIG_SCSI_CPQFCTS is not set
797 # CONFIG_SCSI_EATA_PIO is not set
798 # CONFIG_SCSI_FUTURE_DOMAIN is not set
799 # CONFIG_SCSI_GDTH is not set
800 -# CONFIG_SCSI_GENERIC_NCR5380 is not set
801 -# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
802 # CONFIG_SCSI_INITIO is not set
803 # CONFIG_SCSI_INIA100 is not set
804 -# CONFIG_SCSI_NCR53C7xx is not set
805 CONFIG_SCSI_SYM53C8XX_2=y
806 CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
807 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
809 # CONFIG_SCSI_QLOGIC_1280 is not set
810 # CONFIG_SCSI_DC395x is not set
811 # CONFIG_SCSI_DC390T is not set
812 -# CONFIG_SCSI_U14_34F is not set
813 # CONFIG_SCSI_NSP32 is not set
814 # CONFIG_SCSI_DEBUG is not set
818 # CONFIG_PACKET_MMAP is not set
819 # CONFIG_NETLINK_DEV is not set
821 -# CONFIG_NETFILTER_DEBUG is not set
823 # CONFIG_NET_KEY is not set
826 # CONFIG_INET_IPCOMP is not set
829 +# IP: Virtual Server Configuration
831 +# CONFIG_IP_VS is not set
832 +# CONFIG_IPV6 is not set
833 +# CONFIG_DECNET is not set
834 +# CONFIG_BRIDGE is not set
836 +# CONFIG_NETFILTER_DEBUG is not set
839 # IP: Netfilter Configuration
841 CONFIG_IP_NF_CONNTRACK=m
843 CONFIG_IP_NF_MATCH_MARK=m
844 CONFIG_IP_NF_MATCH_MULTIPORT=m
845 CONFIG_IP_NF_MATCH_TOS=m
846 +CONFIG_IP_NF_MATCH_RECENT=m
847 CONFIG_IP_NF_MATCH_ECN=m
848 CONFIG_IP_NF_MATCH_DSCP=m
849 CONFIG_IP_NF_MATCH_AH_ESP=m
851 # CONFIG_IP_NF_ARPTABLES is not set
852 CONFIG_IP_NF_COMPAT_IPCHAINS=m
853 # CONFIG_IP_NF_COMPAT_IPFWADM is not set
854 -# CONFIG_IPV6 is not set
855 -# CONFIG_XFRM_USER is not set
858 # SCTP Configuration (EXPERIMENTAL)
860 # CONFIG_ATM is not set
861 # CONFIG_VLAN_8021Q is not set
862 # CONFIG_LLC is not set
863 -# CONFIG_DECNET is not set
864 -# CONFIG_BRIDGE is not set
865 # CONFIG_X25 is not set
866 # CONFIG_LAPB is not set
867 # CONFIG_NET_DIVERT is not set
869 # CONFIG_HAMACHI is not set
870 # CONFIG_YELLOWFIN is not set
871 # CONFIG_R8169 is not set
872 +# CONFIG_SIS190 is not set
873 # CONFIG_SK98LIN is not set
874 # CONFIG_TIGON3 is not set
881 +# CONFIG_FB_CIRRUS is not set
882 # CONFIG_FB_PM2 is not set
883 # CONFIG_FB_CYBER2000 is not set
886 CONFIG_LOGO_LINUX_CLUT224=y
889 -# Old CD-ROM drivers (not SCSI, not IDE)
891 -# CONFIG_CD_NO_IDESCSI is not set
894 # Input device support
899 # CONFIG_SERIO_SERPORT is not set
900 # CONFIG_SERIO_CT82C710 is not set
901 +# CONFIG_SERIO_PCIPS2 is not set
904 # Input Device Drivers
905 @@ -703,10 +713,12 @@
907 # I2C Hardware Sensors Mainboard support
909 +# CONFIG_I2C_ALI1535 is not set
910 # CONFIG_I2C_ALI15X3 is not set
911 # CONFIG_I2C_AMD756 is not set
912 # CONFIG_I2C_AMD8111 is not set
913 # CONFIG_I2C_I801 is not set
914 +# CONFIG_I2C_NFORCE2 is not set
915 # CONFIG_I2C_PIIX4 is not set
916 # CONFIG_I2C_SIS96X is not set
917 # CONFIG_I2C_VIAPRO is not set
919 # CONFIG_SENSORS_IT87 is not set
920 # CONFIG_SENSORS_LM75 is not set
921 # CONFIG_SENSORS_LM85 is not set
922 +# CONFIG_SENSORS_LM78 is not set
923 # CONFIG_SENSORS_VIA686A is not set
924 # CONFIG_SENSORS_W83781D is not set
925 # CONFIG_I2C_SENSOR is not set
926 @@ -913,13 +926,70 @@
930 -CONFIG_DMASOUND_AWACS=m
932 +# CONFIG_DMASOUND_AWACS is not set
935 # Advanced Linux Sound Architecture
937 -# CONFIG_SND is not set
939 +CONFIG_SND_SEQUENCER=m
940 +# CONFIG_SND_SEQ_DUMMY is not set
941 +CONFIG_SND_OSSEMUL=y
942 +CONFIG_SND_MIXER_OSS=m
943 +CONFIG_SND_PCM_OSS=m
944 +CONFIG_SND_SEQUENCER_OSS=y
945 +# CONFIG_SND_VERBOSE_PRINTK is not set
946 +# CONFIG_SND_DEBUG is not set
951 +# CONFIG_SND_DUMMY is not set
952 +# CONFIG_SND_VIRMIDI is not set
953 +# CONFIG_SND_MTPAV is not set
954 +# CONFIG_SND_SERIAL_U16550 is not set
955 +# CONFIG_SND_MPU401 is not set
960 +# CONFIG_SND_ALI5451 is not set
961 +# CONFIG_SND_AZT3328 is not set
962 +# CONFIG_SND_CS46XX is not set
963 +# CONFIG_SND_CS4281 is not set
964 +# CONFIG_SND_EMU10K1 is not set
965 +# CONFIG_SND_KORG1212 is not set
966 +# CONFIG_SND_NM256 is not set
967 +# CONFIG_SND_RME32 is not set
968 +# CONFIG_SND_RME96 is not set
969 +# CONFIG_SND_RME9652 is not set
970 +# CONFIG_SND_HDSP is not set
971 +# CONFIG_SND_TRIDENT is not set
972 +# CONFIG_SND_YMFPCI is not set
973 +# CONFIG_SND_ALS4000 is not set
974 +# CONFIG_SND_CMIPCI is not set
975 +# CONFIG_SND_ENS1370 is not set
976 +# CONFIG_SND_ENS1371 is not set
977 +# CONFIG_SND_ES1938 is not set
978 +# CONFIG_SND_ES1968 is not set
979 +# CONFIG_SND_MAESTRO3 is not set
980 +# CONFIG_SND_FM801 is not set
981 +# CONFIG_SND_ICE1712 is not set
982 +# CONFIG_SND_ICE1724 is not set
983 +# CONFIG_SND_INTEL8X0 is not set
984 +# CONFIG_SND_SONICVIBES is not set
985 +# CONFIG_SND_VIA82XX is not set
986 +# CONFIG_SND_VX222 is not set
989 +# ALSA PowerMac devices
991 +CONFIG_SND_POWERMAC=m
996 +CONFIG_SND_USB_AUDIO=m
1000 @@ -998,6 +1068,7 @@
1002 # USB Network adaptors
1004 +# CONFIG_USB_AX8817X is not set
1005 # CONFIG_USB_CATC is not set
1006 # CONFIG_USB_KAWETH is not set
1007 # CONFIG_USB_PEGASUS is not set
1008 @@ -1074,7 +1145,6 @@
1011 # CONFIG_DEBUG_KERNEL is not set
1016 diff -Nru a/arch/ppc/configs/ibmchrp_defconfig b/arch/ppc/configs/ibmchrp_defconfig
1017 --- a/arch/ppc/configs/ibmchrp_defconfig Tue Jul 1 17:01:18 2003
1018 +++ b/arch/ppc/configs/ibmchrp_defconfig Sat Aug 23 02:33:38 2003
1020 # Code maturity level options
1022 CONFIG_EXPERIMENTAL=y
1023 +# CONFIG_BROKEN is not set
1028 # CONFIG_BSD_PROCESS_ACCT is not set
1030 CONFIG_LOG_BUF_SHIFT=14
1032 +CONFIG_IKCONFIG_PROC=y
1033 # CONFIG_EMBEDDED is not set
1037 +CONFIG_IOSCHED_NOOP=y
1038 +CONFIG_IOSCHED_AS=y
1039 +CONFIG_IOSCHED_DEADLINE=y
1042 # Loadable module support
1045 CONFIG_PCI_DOMAINS=y
1047 -CONFIG_BINFMT_ELF=y
1049 +CONFIG_BINFMT_ELF=y
1050 CONFIG_BINFMT_MISC=y
1051 CONFIG_PCI_LEGACY_PROC=y
1053 @@ -116,6 +123,10 @@
1054 CONFIG_BOOT_LOAD=0x00800000
1057 +# Generic Driver Options
1061 # Memory Technology Devices (MTD)
1063 # CONFIG_MTD is not set
1064 @@ -134,10 +145,12 @@
1065 # CONFIG_BLK_DEV_DAC960 is not set
1066 # CONFIG_BLK_DEV_UMEM is not set
1067 CONFIG_BLK_DEV_LOOP=y
1068 +# CONFIG_BLK_DEV_CRYPTOLOOP is not set
1069 # CONFIG_BLK_DEV_NBD is not set
1070 CONFIG_BLK_DEV_RAM=y
1071 CONFIG_BLK_DEV_RAM_SIZE=4096
1072 CONFIG_BLK_DEV_INITRD=y
1076 # Multi-device support (RAID and LVM)
1077 @@ -145,12 +158,12 @@
1078 # CONFIG_MD is not set
1081 -# ATA/IDE/MFM/RLL support
1082 +# ATA/ATAPI/MFM/RLL support
1084 # CONFIG_IDE is not set
1088 +# SCSI device support
1093 # CONFIG_SCSI_AIC79XX is not set
1094 # CONFIG_SCSI_DPT_I2O is not set
1095 # CONFIG_SCSI_ADVANSYS is not set
1096 -# CONFIG_SCSI_IN2000 is not set
1097 -# CONFIG_SCSI_AM53C974 is not set
1098 # CONFIG_SCSI_MEGARAID is not set
1099 # CONFIG_SCSI_BUSLOGIC is not set
1100 # CONFIG_SCSI_CPQFCTS is not set
1101 @@ -193,11 +204,8 @@
1102 # CONFIG_SCSI_EATA_PIO is not set
1103 # CONFIG_SCSI_FUTURE_DOMAIN is not set
1104 # CONFIG_SCSI_GDTH is not set
1105 -# CONFIG_SCSI_GENERIC_NCR5380 is not set
1106 -# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
1107 # CONFIG_SCSI_INITIO is not set
1108 # CONFIG_SCSI_INIA100 is not set
1109 -# CONFIG_SCSI_NCR53C7xx is not set
1110 CONFIG_SCSI_SYM53C8XX_2=y
1111 CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
1112 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
1114 # CONFIG_SCSI_QLOGIC_1280 is not set
1115 # CONFIG_SCSI_DC395x is not set
1116 # CONFIG_SCSI_DC390T is not set
1117 -# CONFIG_SCSI_U14_34F is not set
1118 # CONFIG_SCSI_NSP32 is not set
1119 # CONFIG_SCSI_DEBUG is not set
1120 # CONFIG_SCSI_MESH is not set
1123 # CONFIG_PACKET_MMAP is not set
1124 # CONFIG_NETLINK_DEV is not set
1126 -# CONFIG_NETFILTER_DEBUG is not set
1128 # CONFIG_NET_KEY is not set
1130 @@ -261,6 +266,16 @@
1131 # CONFIG_INET_IPCOMP is not set
1134 +# IP: Virtual Server Configuration
1136 +# CONFIG_IP_VS is not set
1137 +# CONFIG_IPV6 is not set
1138 +# CONFIG_DECNET is not set
1139 +# CONFIG_BRIDGE is not set
1141 +# CONFIG_NETFILTER_DEBUG is not set
1144 # IP: Netfilter Configuration
1146 CONFIG_IP_NF_CONNTRACK=m
1148 CONFIG_IP_NF_MATCH_MARK=m
1149 CONFIG_IP_NF_MATCH_MULTIPORT=m
1150 CONFIG_IP_NF_MATCH_TOS=m
1151 +CONFIG_IP_NF_MATCH_RECENT=m
1152 CONFIG_IP_NF_MATCH_ECN=m
1153 CONFIG_IP_NF_MATCH_DSCP=m
1154 CONFIG_IP_NF_MATCH_AH_ESP=m
1155 @@ -306,10 +322,9 @@
1156 CONFIG_IP_NF_TARGET_TCPMSS=m
1157 CONFIG_IP_NF_ARPTABLES=m
1158 CONFIG_IP_NF_ARPFILTER=m
1159 +CONFIG_IP_NF_ARP_MANGLE=m
1160 CONFIG_IP_NF_COMPAT_IPCHAINS=m
1161 # CONFIG_IP_NF_COMPAT_IPFWADM is not set
1162 -# CONFIG_IPV6 is not set
1163 -# CONFIG_XFRM_USER is not set
1166 # SCTP Configuration (EXPERIMENTAL)
1168 # CONFIG_ATM is not set
1169 # CONFIG_VLAN_8021Q is not set
1170 # CONFIG_LLC is not set
1171 -# CONFIG_DECNET is not set
1172 -# CONFIG_BRIDGE is not set
1173 # CONFIG_X25 is not set
1174 # CONFIG_LAPB is not set
1175 # CONFIG_NET_DIVERT is not set
1177 # CONFIG_HAMACHI is not set
1178 # CONFIG_YELLOWFIN is not set
1179 # CONFIG_R8169 is not set
1180 +# CONFIG_SIS190 is not set
1181 # CONFIG_SK98LIN is not set
1182 # CONFIG_TIGON3 is not set
1184 @@ -495,11 +509,6 @@
1185 CONFIG_LOGO_LINUX_CLUT224=y
1188 -# Old CD-ROM drivers (not SCSI, not IDE)
1190 -# CONFIG_CD_NO_IDESCSI is not set
1193 # Input device support
1197 CONFIG_SERIO_I8042=y
1198 CONFIG_SERIO_SERPORT=y
1199 # CONFIG_SERIO_CT82C710 is not set
1200 +# CONFIG_SERIO_PCIPS2 is not set
1203 # Input Device Drivers
1207 # CONFIG_DEBUG_KERNEL is not set
1209 # CONFIG_BOOTX_TEXT is not set
1212 diff -Nru a/arch/ppc/configs/mcpn765_defconfig b/arch/ppc/configs/mcpn765_defconfig
1213 --- a/arch/ppc/configs/mcpn765_defconfig Tue Jul 1 17:01:18 2003
1214 +++ b/arch/ppc/configs/mcpn765_defconfig Mon Jul 21 09:05:22 2003
1217 CONFIG_LOG_BUF_SHIFT=14
1218 # CONFIG_EMBEDDED is not set
1225 CONFIG_PCI_DOMAINS=y
1227 -CONFIG_BINFMT_ELF=y
1229 +CONFIG_BINFMT_ELF=y
1230 # CONFIG_BINFMT_MISC is not set
1231 # CONFIG_PCI_LEGACY_PROC is not set
1232 # CONFIG_PCI_NAMES is not set
1233 @@ -104,6 +105,11 @@
1234 CONFIG_BOOT_LOAD=0x00800000
1237 +# Generic Driver Options
1239 +# CONFIG_FW_LOADER is not set
1242 # Memory Technology Devices (MTD)
1244 # CONFIG_MTD is not set
1245 @@ -122,10 +128,12 @@
1246 # CONFIG_BLK_DEV_DAC960 is not set
1247 # CONFIG_BLK_DEV_UMEM is not set
1248 CONFIG_BLK_DEV_LOOP=y
1249 +# CONFIG_BLK_DEV_CRYPTOLOOP is not set
1250 # CONFIG_BLK_DEV_NBD is not set
1251 CONFIG_BLK_DEV_RAM=y
1252 CONFIG_BLK_DEV_RAM_SIZE=4096
1253 CONFIG_BLK_DEV_INITRD=y
1254 +# CONFIG_LBD is not set
1257 # Multi-device support (RAID and LVM)
1258 @@ -133,12 +141,12 @@
1259 # CONFIG_MD is not set
1262 -# ATA/IDE/MFM/RLL support
1263 +# ATA/ATAPI/MFM/RLL support
1265 # CONFIG_IDE is not set
1269 +# SCSI device support
1271 # CONFIG_SCSI is not set
1273 @@ -320,11 +328,6 @@
1274 # CONFIG_FB is not set
1277 -# Old CD-ROM drivers (not SCSI, not IDE)
1279 -# CONFIG_CD_NO_IDESCSI is not set
1282 # Input device support
1284 # CONFIG_INPUT is not set
1288 # CONFIG_DEBUG_KERNEL is not set
1289 -# CONFIG_KALLSYMS is not set
1290 # CONFIG_SERIAL_TEXT_DEBUG is not set
1293 diff -Nru a/arch/ppc/configs/pmac_defconfig b/arch/ppc/configs/pmac_defconfig
1294 --- a/arch/ppc/configs/pmac_defconfig Sat Aug 2 13:06:57 2003
1295 +++ b/arch/ppc/configs/pmac_defconfig Sat Aug 23 02:33:38 2003
1297 # Code maturity level options
1299 CONFIG_EXPERIMENTAL=y
1300 +# CONFIG_BROKEN is not set
1305 # CONFIG_BSD_PROCESS_ACCT is not set
1307 CONFIG_LOG_BUF_SHIFT=14
1309 +CONFIG_IKCONFIG_PROC=y
1310 # CONFIG_EMBEDDED is not set
1314 +CONFIG_IOSCHED_NOOP=y
1315 +CONFIG_IOSCHED_AS=y
1316 +CONFIG_IOSCHED_DEADLINE=y
1319 # Loadable module support
1321 # CONFIG_TAU_INT is not set
1322 # CONFIG_TAU_AVERAGE is not set
1324 +CONFIG_CPU_FREQ_TABLE=y
1325 CONFIG_CPU_FREQ_PROC_INTF=y
1326 CONFIG_CPU_FREQ_24_API=y
1327 CONFIG_CPU_FREQ_PMAC=y
1330 CONFIG_PCI_DOMAINS=y
1332 -CONFIG_BINFMT_ELF=y
1334 +CONFIG_BINFMT_ELF=y
1335 CONFIG_BINFMT_MISC=m
1336 CONFIG_PCI_LEGACY_PROC=y
1339 # PCMCIA/CardBus support
1349 @@ -131,6 +139,11 @@
1350 CONFIG_BOOT_LOAD=0x00800000
1353 +# Generic Driver Options
1355 +# CONFIG_FW_LOADER is not set
1358 # Memory Technology Devices (MTD)
1360 # CONFIG_MTD is not set
1361 @@ -149,10 +162,12 @@
1362 # CONFIG_BLK_DEV_DAC960 is not set
1363 # CONFIG_BLK_DEV_UMEM is not set
1364 CONFIG_BLK_DEV_LOOP=y
1365 +# CONFIG_BLK_DEV_CRYPTOLOOP is not set
1366 # CONFIG_BLK_DEV_NBD is not set
1367 CONFIG_BLK_DEV_RAM=y
1368 CONFIG_BLK_DEV_RAM_SIZE=4096
1369 CONFIG_BLK_DEV_INITRD=y
1373 # Multi-device support (RAID and LVM)
1374 @@ -160,41 +175,39 @@
1375 # CONFIG_MD is not set
1378 -# ATA/IDE/MFM/RLL support
1379 +# ATA/ATAPI/MFM/RLL support
1384 -# IDE, ATA and ATAPI Block devices
1386 CONFIG_BLK_DEV_IDE=y
1389 # Please see Documentation/ide.txt for help/info on IDE drives
1391 -# CONFIG_BLK_DEV_HD is not set
1392 CONFIG_BLK_DEV_IDEDISK=y
1393 # CONFIG_IDEDISK_MULTI_MODE is not set
1394 # CONFIG_IDEDISK_STROKE is not set
1395 CONFIG_BLK_DEV_IDECS=m
1396 CONFIG_BLK_DEV_IDECD=y
1397 +# CONFIG_BLK_DEV_IDETAPE is not set
1398 CONFIG_BLK_DEV_IDEFLOPPY=y
1399 CONFIG_BLK_DEV_IDESCSI=y
1400 # CONFIG_IDE_TASK_IOCTL is not set
1401 +# CONFIG_IDE_TASKFILE_IO is not set
1404 # IDE chipset support/bugfixes
1406 CONFIG_BLK_DEV_IDEPCI=y
1407 -CONFIG_BLK_DEV_GENERIC=y
1408 CONFIG_IDEPCI_SHARE_IRQ=y
1409 +# CONFIG_BLK_DEV_OFFBOARD is not set
1410 +CONFIG_BLK_DEV_GENERIC=y
1411 +# CONFIG_BLK_DEV_OPTI621 is not set
1412 +CONFIG_BLK_DEV_SL82C105=y
1413 CONFIG_BLK_DEV_IDEDMA_PCI=y
1414 # CONFIG_BLK_DEV_IDE_TCQ is not set
1415 -# CONFIG_BLK_DEV_OFFBOARD is not set
1416 # CONFIG_BLK_DEV_IDEDMA_FORCED is not set
1417 CONFIG_IDEDMA_PCI_AUTO=y
1418 # CONFIG_IDEDMA_ONLYDISK is not set
1419 -CONFIG_BLK_DEV_IDEDMA=y
1420 # CONFIG_IDEDMA_PCI_WIP is not set
1421 CONFIG_BLK_DEV_ADMA=y
1422 # CONFIG_BLK_DEV_AEC62XX is not set
1423 @@ -204,12 +217,12 @@
1424 # CONFIG_BLK_DEV_TRIFLEX is not set
1425 # CONFIG_BLK_DEV_CY82C693 is not set
1426 # CONFIG_BLK_DEV_CS5520 is not set
1427 +# CONFIG_BLK_DEV_CS5530 is not set
1428 # CONFIG_BLK_DEV_HPT34X is not set
1429 # CONFIG_BLK_DEV_HPT366 is not set
1430 # CONFIG_BLK_DEV_SC1200 is not set
1431 # CONFIG_BLK_DEV_PIIX is not set
1432 # CONFIG_BLK_DEV_NS87415 is not set
1433 -# CONFIG_BLK_DEV_OPTI621 is not set
1434 # CONFIG_BLK_DEV_PDC202XX_OLD is not set
1435 CONFIG_BLK_DEV_PDC202XX_NEW=y
1436 # CONFIG_PDC202XX_FORCE is not set
1437 @@ -218,15 +231,17 @@
1438 # CONFIG_BLK_DEV_SLC90E66 is not set
1439 # CONFIG_BLK_DEV_TRM290 is not set
1440 # CONFIG_BLK_DEV_VIA82CXXX is not set
1441 -CONFIG_BLK_DEV_SL82C105=y
1442 CONFIG_BLK_DEV_IDE_PMAC=y
1443 CONFIG_BLK_DEV_IDEDMA_PMAC=y
1444 CONFIG_BLK_DEV_IDEDMA_PMAC_AUTO=y
1445 -CONFIG_IDEDMA_AUTO=y
1446 +CONFIG_BLK_DEV_IDEDMA=y
1447 # CONFIG_IDEDMA_IVB is not set
1448 +CONFIG_IDEDMA_AUTO=y
1449 +# CONFIG_DMA_NONPCI is not set
1450 +# CONFIG_BLK_DEV_HD is not set
1454 +# SCSI device support
1459 # CONFIG_SCSI_AIC79XX is not set
1460 # CONFIG_SCSI_DPT_I2O is not set
1461 CONFIG_SCSI_ADVANSYS=m
1462 -# CONFIG_SCSI_IN2000 is not set
1463 -# CONFIG_SCSI_AM53C974 is not set
1464 # CONFIG_SCSI_MEGARAID is not set
1465 # CONFIG_SCSI_BUSLOGIC is not set
1466 # CONFIG_SCSI_CPQFCTS is not set
1467 @@ -276,11 +289,8 @@
1468 # CONFIG_SCSI_EATA_PIO is not set
1469 # CONFIG_SCSI_FUTURE_DOMAIN is not set
1470 # CONFIG_SCSI_GDTH is not set
1471 -# CONFIG_SCSI_GENERIC_NCR5380 is not set
1472 -# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
1473 # CONFIG_SCSI_INITIO is not set
1474 # CONFIG_SCSI_INIA100 is not set
1475 -# CONFIG_SCSI_NCR53C7xx is not set
1476 CONFIG_SCSI_SYM53C8XX_2=y
1477 CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
1478 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
1480 # CONFIG_SCSI_QLOGIC_1280 is not set
1481 # CONFIG_SCSI_DC395x is not set
1482 # CONFIG_SCSI_DC390T is not set
1483 -# CONFIG_SCSI_U14_34F is not set
1484 # CONFIG_SCSI_NSP32 is not set
1485 # CONFIG_SCSI_DEBUG is not set
1489 # CONFIG_PACKET_MMAP is not set
1490 # CONFIG_NETLINK_DEV is not set
1492 -# CONFIG_NETFILTER_DEBUG is not set
1494 # CONFIG_NET_KEY is not set
1496 @@ -380,6 +387,16 @@
1497 # CONFIG_INET_IPCOMP is not set
1500 +# IP: Virtual Server Configuration
1502 +# CONFIG_IP_VS is not set
1503 +# CONFIG_IPV6 is not set
1504 +# CONFIG_DECNET is not set
1505 +# CONFIG_BRIDGE is not set
1507 +# CONFIG_NETFILTER_DEBUG is not set
1510 # IP: Netfilter Configuration
1512 CONFIG_IP_NF_CONNTRACK=m
1514 CONFIG_IP_NF_MATCH_MARK=m
1515 CONFIG_IP_NF_MATCH_MULTIPORT=m
1516 CONFIG_IP_NF_MATCH_TOS=m
1517 +CONFIG_IP_NF_MATCH_RECENT=m
1518 CONFIG_IP_NF_MATCH_ECN=m
1519 CONFIG_IP_NF_MATCH_DSCP=m
1520 CONFIG_IP_NF_MATCH_AH_ESP=m
1521 @@ -425,10 +443,9 @@
1522 CONFIG_IP_NF_TARGET_TCPMSS=m
1523 CONFIG_IP_NF_ARPTABLES=m
1524 CONFIG_IP_NF_ARPFILTER=m
1525 +CONFIG_IP_NF_ARP_MANGLE=m
1526 CONFIG_IP_NF_COMPAT_IPCHAINS=m
1527 # CONFIG_IP_NF_COMPAT_IPFWADM is not set
1528 -# CONFIG_IPV6 is not set
1529 -# CONFIG_XFRM_USER is not set
1532 # SCTP Configuration (EXPERIMENTAL)
1534 # CONFIG_ATM is not set
1535 # CONFIG_VLAN_8021Q is not set
1536 # CONFIG_LLC is not set
1537 -# CONFIG_DECNET is not set
1538 -# CONFIG_BRIDGE is not set
1539 # CONFIG_X25 is not set
1540 # CONFIG_LAPB is not set
1541 # CONFIG_NET_DIVERT is not set
1543 # CONFIG_HAMACHI is not set
1544 # CONFIG_YELLOWFIN is not set
1545 # CONFIG_R8169 is not set
1546 +# CONFIG_SIS190 is not set
1547 # CONFIG_SK98LIN is not set
1548 # CONFIG_TIGON3 is not set
1551 CONFIG_PCMCIA_HERMES=m
1552 # CONFIG_AIRO_CS is not set
1553 # CONFIG_PCMCIA_ATMEL is not set
1554 +# CONFIG_PCMCIA_WL3501 is not set
1555 CONFIG_NET_WIRELESS=y
1558 @@ -637,25 +654,18 @@
1560 # Old SIR device drivers
1562 -# CONFIG_IRTTY_OLD is not set
1563 # CONFIG_IRPORT_SIR is not set
1566 # Old Serial dongle support
1568 -# CONFIG_DONGLE_OLD is not set
1571 # FIR device drivers
1573 # CONFIG_USB_IRDA is not set
1574 -# CONFIG_NSC_FIR is not set
1575 -# CONFIG_WINBOND_FIR is not set
1576 # CONFIG_TOSHIBA_OLD is not set
1577 # CONFIG_TOSHIBA_FIR is not set
1578 -# CONFIG_SMC_IRCC_OLD is not set
1579 -# CONFIG_SMC_IRCC_FIR is not set
1580 -# CONFIG_ALI_FIR is not set
1581 # CONFIG_VLSI_FIR is not set
1584 @@ -721,11 +731,6 @@
1585 CONFIG_LOGO_LINUX_CLUT224=y
1588 -# Old CD-ROM drivers (not SCSI, not IDE)
1590 -# CONFIG_CD_NO_IDESCSI is not set
1593 # Input device support
1598 CONFIG_PMAC_APM_EMU=y
1599 CONFIG_PMAC_BACKLIGHT=y
1600 -CONFIG_MAC_FLOPPY=y
1601 +# CONFIG_MAC_FLOPPY is not set
1605 @@ -808,10 +813,12 @@
1607 # I2C Hardware Sensors Mainboard support
1609 +# CONFIG_I2C_ALI1535 is not set
1610 # CONFIG_I2C_ALI15X3 is not set
1611 # CONFIG_I2C_AMD756 is not set
1612 # CONFIG_I2C_AMD8111 is not set
1613 # CONFIG_I2C_I801 is not set
1614 +# CONFIG_I2C_NFORCE2 is not set
1615 # CONFIG_I2C_PIIX4 is not set
1616 # CONFIG_I2C_SIS96X is not set
1617 # CONFIG_I2C_VIAPRO is not set
1619 # CONFIG_SENSORS_IT87 is not set
1620 # CONFIG_SENSORS_LM75 is not set
1621 # CONFIG_SENSORS_LM85 is not set
1622 +# CONFIG_SENSORS_LM78 is not set
1623 # CONFIG_SENSORS_VIA686A is not set
1624 # CONFIG_SENSORS_W83781D is not set
1625 # CONFIG_I2C_SENSOR is not set
1626 @@ -1028,8 +1036,7 @@
1630 -CONFIG_DMASOUND_AWACS=m
1632 +# CONFIG_DMASOUND_AWACS is not set
1635 # Advanced Linux Sound Architecture
1636 @@ -1168,6 +1175,7 @@
1638 # USB Network adaptors
1640 +# CONFIG_USB_AX8817X is not set
1641 # CONFIG_USB_CATC is not set
1642 # CONFIG_USB_KAWETH is not set
1643 # CONFIG_USB_PEGASUS is not set
1644 @@ -1231,7 +1239,6 @@
1647 # CONFIG_DEBUG_KERNEL is not set
1652 diff -Nru a/arch/ppc/configs/power3_defconfig b/arch/ppc/configs/power3_defconfig
1653 --- a/arch/ppc/configs/power3_defconfig Tue Jul 1 17:01:18 2003
1654 +++ b/arch/ppc/configs/power3_defconfig Sat Aug 23 02:33:38 2003
1656 # Code maturity level options
1658 CONFIG_EXPERIMENTAL=y
1659 +# CONFIG_BROKEN is not set
1664 # CONFIG_BSD_PROCESS_ACCT is not set
1666 CONFIG_LOG_BUF_SHIFT=15
1668 +CONFIG_IKCONFIG_PROC=y
1669 # CONFIG_EMBEDDED is not set
1673 +CONFIG_IOSCHED_NOOP=y
1674 +CONFIG_IOSCHED_AS=y
1675 +CONFIG_IOSCHED_DEADLINE=y
1678 # Loadable module support
1681 CONFIG_PCI_DOMAINS=y
1683 -CONFIG_BINFMT_ELF=y
1685 +CONFIG_BINFMT_ELF=y
1686 CONFIG_BINFMT_MISC=y
1687 CONFIG_PCI_LEGACY_PROC=y
1689 @@ -121,6 +128,10 @@
1690 CONFIG_BOOT_LOAD=0x00800000
1693 +# Generic Driver Options
1697 # Memory Technology Devices (MTD)
1699 # CONFIG_MTD is not set
1700 @@ -140,10 +151,12 @@
1701 # CONFIG_BLK_DEV_DAC960 is not set
1702 # CONFIG_BLK_DEV_UMEM is not set
1703 CONFIG_BLK_DEV_LOOP=y
1704 +# CONFIG_BLK_DEV_CRYPTOLOOP is not set
1705 # CONFIG_BLK_DEV_NBD is not set
1706 CONFIG_BLK_DEV_RAM=y
1707 CONFIG_BLK_DEV_RAM_SIZE=4096
1708 CONFIG_BLK_DEV_INITRD=y
1712 # Multi-device support (RAID and LVM)
1713 @@ -156,14 +169,15 @@
1715 # CONFIG_MD_MULTIPATH is not set
1717 +CONFIG_DM_IOCTL_V4=y
1720 -# ATA/IDE/MFM/RLL support
1721 +# ATA/ATAPI/MFM/RLL support
1723 # CONFIG_IDE is not set
1727 +# SCSI device support
1732 # CONFIG_SCSI_AIC79XX is not set
1733 # CONFIG_SCSI_DPT_I2O is not set
1734 # CONFIG_SCSI_ADVANSYS is not set
1735 -# CONFIG_SCSI_IN2000 is not set
1736 -# CONFIG_SCSI_AM53C974 is not set
1737 # CONFIG_SCSI_MEGARAID is not set
1738 # CONFIG_SCSI_BUSLOGIC is not set
1739 # CONFIG_SCSI_CPQFCTS is not set
1740 @@ -206,13 +218,10 @@
1741 # CONFIG_SCSI_EATA_PIO is not set
1742 # CONFIG_SCSI_FUTURE_DOMAIN is not set
1743 # CONFIG_SCSI_GDTH is not set
1744 -# CONFIG_SCSI_GENERIC_NCR5380 is not set
1745 -# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
1746 # CONFIG_SCSI_INITIO is not set
1747 # CONFIG_SCSI_INIA100 is not set
1748 # CONFIG_SCSI_PPA is not set
1749 # CONFIG_SCSI_IMM is not set
1750 -# CONFIG_SCSI_NCR53C7xx is not set
1751 CONFIG_SCSI_SYM53C8XX_2=y
1752 CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
1753 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
1755 # CONFIG_SCSI_QLOGIC_1280 is not set
1756 # CONFIG_SCSI_DC395x is not set
1757 # CONFIG_SCSI_DC390T is not set
1758 -# CONFIG_SCSI_U14_34F is not set
1759 # CONFIG_SCSI_NSP32 is not set
1760 # CONFIG_SCSI_DEBUG is not set
1761 # CONFIG_SCSI_MESH is not set
1764 # CONFIG_PACKET_MMAP is not set
1765 # CONFIG_NETLINK_DEV is not set
1766 -# CONFIG_NETFILTER is not set
1768 # CONFIG_NET_KEY is not set
1771 # CONFIG_INET_ESP is not set
1772 # CONFIG_INET_IPCOMP is not set
1773 # CONFIG_IPV6 is not set
1774 -# CONFIG_XFRM_USER is not set
1775 +# CONFIG_DECNET is not set
1776 +# CONFIG_BRIDGE is not set
1777 +# CONFIG_NETFILTER is not set
1780 # SCTP Configuration (EXPERIMENTAL)
1782 # CONFIG_ATM is not set
1783 # CONFIG_VLAN_8021Q is not set
1784 # CONFIG_LLC is not set
1785 -# CONFIG_DECNET is not set
1786 -# CONFIG_BRIDGE is not set
1787 # CONFIG_X25 is not set
1788 # CONFIG_LAPB is not set
1789 # CONFIG_NET_DIVERT is not set
1791 # CONFIG_HAMACHI is not set
1792 # CONFIG_YELLOWFIN is not set
1793 # CONFIG_R8169 is not set
1794 +# CONFIG_SIS190 is not set
1795 # CONFIG_SK98LIN is not set
1796 # CONFIG_TIGON3 is not set
1798 @@ -464,11 +472,6 @@
1799 CONFIG_LOGO_LINUX_CLUT224=y
1802 -# Old CD-ROM drivers (not SCSI, not IDE)
1804 -# CONFIG_CD_NO_IDESCSI is not set
1807 # Input device support
1811 CONFIG_SERIO_SERPORT=y
1812 # CONFIG_SERIO_CT82C710 is not set
1813 # CONFIG_SERIO_PARKBD is not set
1814 +# CONFIG_SERIO_PCIPS2 is not set
1817 # Input Device Drivers
1821 CONFIG_I2C_ALGOBIT=y
1822 +# CONFIG_I2C_PROSAVAGE is not set
1823 # CONFIG_I2C_PHILIPSPAR is not set
1824 -# CONFIG_I2C_ELV is not set
1825 -# CONFIG_I2C_VELLEMAN is not set
1826 # CONFIG_SCx200_ACB is not set
1827 CONFIG_I2C_ALGOPCF=y
1828 # CONFIG_I2C_ELEKTOR is not set
1829 @@ -566,10 +569,12 @@
1831 # I2C Hardware Sensors Mainboard support
1833 +# CONFIG_I2C_ALI1535 is not set
1834 # CONFIG_I2C_ALI15X3 is not set
1835 # CONFIG_I2C_AMD756 is not set
1836 # CONFIG_I2C_AMD8111 is not set
1837 # CONFIG_I2C_I801 is not set
1838 +# CONFIG_I2C_NFORCE2 is not set
1839 # CONFIG_I2C_PIIX4 is not set
1840 # CONFIG_I2C_SIS96X is not set
1841 # CONFIG_I2C_VIAPRO is not set
1843 # CONFIG_SENSORS_IT87 is not set
1844 # CONFIG_SENSORS_LM75 is not set
1845 # CONFIG_SENSORS_LM85 is not set
1846 +# CONFIG_SENSORS_LM78 is not set
1847 # CONFIG_SENSORS_VIA686A is not set
1848 # CONFIG_SENSORS_W83781D is not set
1849 # CONFIG_I2C_SENSOR is not set
1853 # CONFIG_DEBUG_KERNEL is not set
1858 diff -Nru a/arch/ppc/defconfig b/arch/ppc/defconfig
1859 --- a/arch/ppc/defconfig Sat Aug 2 12:59:32 2003
1860 +++ b/arch/ppc/defconfig Sat Aug 23 02:33:38 2003
1862 # Code maturity level options
1864 CONFIG_EXPERIMENTAL=y
1865 +# CONFIG_BROKEN is not set
1870 # CONFIG_BSD_PROCESS_ACCT is not set
1872 CONFIG_LOG_BUF_SHIFT=14
1874 +CONFIG_IKCONFIG_PROC=y
1875 # CONFIG_EMBEDDED is not set
1879 +CONFIG_IOSCHED_NOOP=y
1880 +CONFIG_IOSCHED_AS=y
1881 +CONFIG_IOSCHED_DEADLINE=y
1884 # Loadable module support
1886 # CONFIG_TAU_INT is not set
1887 # CONFIG_TAU_AVERAGE is not set
1889 +CONFIG_CPU_FREQ_TABLE=y
1890 CONFIG_CPU_FREQ_PROC_INTF=y
1891 CONFIG_CPU_FREQ_24_API=y
1892 CONFIG_CPU_FREQ_PMAC=y
1895 CONFIG_PCI_DOMAINS=y
1897 -CONFIG_BINFMT_ELF=y
1899 +CONFIG_BINFMT_ELF=y
1900 CONFIG_BINFMT_MISC=m
1901 CONFIG_PCI_LEGACY_PROC=y
1903 @@ -128,6 +136,11 @@
1904 CONFIG_BOOT_LOAD=0x00800000
1907 +# Generic Driver Options
1909 +# CONFIG_FW_LOADER is not set
1912 # Memory Technology Devices (MTD)
1914 # CONFIG_MTD is not set
1915 @@ -146,10 +159,12 @@
1916 # CONFIG_BLK_DEV_DAC960 is not set
1917 # CONFIG_BLK_DEV_UMEM is not set
1918 CONFIG_BLK_DEV_LOOP=y
1919 +# CONFIG_BLK_DEV_CRYPTOLOOP is not set
1920 # CONFIG_BLK_DEV_NBD is not set
1921 CONFIG_BLK_DEV_RAM=y
1922 CONFIG_BLK_DEV_RAM_SIZE=4096
1923 CONFIG_BLK_DEV_INITRD=y
1927 # Multi-device support (RAID and LVM)
1928 @@ -157,40 +172,38 @@
1929 # CONFIG_MD is not set
1932 -# ATA/IDE/MFM/RLL support
1933 +# ATA/ATAPI/MFM/RLL support
1938 -# IDE, ATA and ATAPI Block devices
1940 CONFIG_BLK_DEV_IDE=y
1943 # Please see Documentation/ide.txt for help/info on IDE drives
1945 -# CONFIG_BLK_DEV_HD is not set
1946 CONFIG_BLK_DEV_IDEDISK=y
1947 # CONFIG_IDEDISK_MULTI_MODE is not set
1948 # CONFIG_IDEDISK_STROKE is not set
1949 CONFIG_BLK_DEV_IDECD=y
1950 +# CONFIG_BLK_DEV_IDETAPE is not set
1951 CONFIG_BLK_DEV_IDEFLOPPY=y
1952 CONFIG_BLK_DEV_IDESCSI=y
1953 # CONFIG_IDE_TASK_IOCTL is not set
1954 +# CONFIG_IDE_TASKFILE_IO is not set
1957 # IDE chipset support/bugfixes
1959 CONFIG_BLK_DEV_IDEPCI=y
1960 -CONFIG_BLK_DEV_GENERIC=y
1961 CONFIG_IDEPCI_SHARE_IRQ=y
1962 +# CONFIG_BLK_DEV_OFFBOARD is not set
1963 +CONFIG_BLK_DEV_GENERIC=y
1964 +# CONFIG_BLK_DEV_OPTI621 is not set
1965 +CONFIG_BLK_DEV_SL82C105=y
1966 CONFIG_BLK_DEV_IDEDMA_PCI=y
1967 # CONFIG_BLK_DEV_IDE_TCQ is not set
1968 -# CONFIG_BLK_DEV_OFFBOARD is not set
1969 # CONFIG_BLK_DEV_IDEDMA_FORCED is not set
1970 CONFIG_IDEDMA_PCI_AUTO=y
1971 # CONFIG_IDEDMA_ONLYDISK is not set
1972 -CONFIG_BLK_DEV_IDEDMA=y
1973 # CONFIG_IDEDMA_PCI_WIP is not set
1974 CONFIG_BLK_DEV_ADMA=y
1975 # CONFIG_BLK_DEV_AEC62XX is not set
1976 @@ -200,12 +213,12 @@
1977 # CONFIG_BLK_DEV_TRIFLEX is not set
1978 # CONFIG_BLK_DEV_CY82C693 is not set
1979 # CONFIG_BLK_DEV_CS5520 is not set
1980 +# CONFIG_BLK_DEV_CS5530 is not set
1981 # CONFIG_BLK_DEV_HPT34X is not set
1982 # CONFIG_BLK_DEV_HPT366 is not set
1983 # CONFIG_BLK_DEV_SC1200 is not set
1984 # CONFIG_BLK_DEV_PIIX is not set
1985 # CONFIG_BLK_DEV_NS87415 is not set
1986 -# CONFIG_BLK_DEV_OPTI621 is not set
1987 # CONFIG_BLK_DEV_PDC202XX_OLD is not set
1988 # CONFIG_BLK_DEV_PDC202XX_NEW is not set
1989 # CONFIG_BLK_DEV_SVWKS is not set
1990 @@ -213,15 +226,17 @@
1991 # CONFIG_BLK_DEV_SLC90E66 is not set
1992 # CONFIG_BLK_DEV_TRM290 is not set
1993 # CONFIG_BLK_DEV_VIA82CXXX is not set
1994 -CONFIG_BLK_DEV_SL82C105=y
1995 CONFIG_BLK_DEV_IDE_PMAC=y
1996 CONFIG_BLK_DEV_IDEDMA_PMAC=y
1997 CONFIG_BLK_DEV_IDEDMA_PMAC_AUTO=y
1998 -CONFIG_IDEDMA_AUTO=y
1999 +CONFIG_BLK_DEV_IDEDMA=y
2000 # CONFIG_IDEDMA_IVB is not set
2001 +CONFIG_IDEDMA_AUTO=y
2002 +# CONFIG_DMA_NONPCI is not set
2003 +# CONFIG_BLK_DEV_HD is not set
2007 +# SCSI device support
2012 # CONFIG_SCSI_AIC79XX is not set
2013 # CONFIG_SCSI_DPT_I2O is not set
2014 CONFIG_SCSI_ADVANSYS=m
2015 -# CONFIG_SCSI_IN2000 is not set
2016 -# CONFIG_SCSI_AM53C974 is not set
2017 # CONFIG_SCSI_MEGARAID is not set
2018 # CONFIG_SCSI_BUSLOGIC is not set
2019 # CONFIG_SCSI_CPQFCTS is not set
2020 @@ -271,11 +284,8 @@
2021 # CONFIG_SCSI_EATA_PIO is not set
2022 # CONFIG_SCSI_FUTURE_DOMAIN is not set
2023 # CONFIG_SCSI_GDTH is not set
2024 -# CONFIG_SCSI_GENERIC_NCR5380 is not set
2025 -# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
2026 # CONFIG_SCSI_INITIO is not set
2027 # CONFIG_SCSI_INIA100 is not set
2028 -# CONFIG_SCSI_NCR53C7xx is not set
2029 CONFIG_SCSI_SYM53C8XX_2=y
2030 CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
2031 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
2033 # CONFIG_SCSI_QLOGIC_1280 is not set
2034 # CONFIG_SCSI_DC395x is not set
2035 # CONFIG_SCSI_DC390T is not set
2036 -# CONFIG_SCSI_U14_34F is not set
2037 # CONFIG_SCSI_NSP32 is not set
2038 # CONFIG_SCSI_DEBUG is not set
2042 # CONFIG_PACKET_MMAP is not set
2043 # CONFIG_NETLINK_DEV is not set
2045 -# CONFIG_NETFILTER_DEBUG is not set
2047 # CONFIG_NET_KEY is not set
2049 @@ -341,6 +348,16 @@
2050 # CONFIG_INET_IPCOMP is not set
2053 +# IP: Virtual Server Configuration
2055 +# CONFIG_IP_VS is not set
2056 +# CONFIG_IPV6 is not set
2057 +# CONFIG_DECNET is not set
2058 +# CONFIG_BRIDGE is not set
2060 +# CONFIG_NETFILTER_DEBUG is not set
2063 # IP: Netfilter Configuration
2065 CONFIG_IP_NF_CONNTRACK=m
2067 CONFIG_IP_NF_MATCH_MARK=m
2068 CONFIG_IP_NF_MATCH_MULTIPORT=m
2069 CONFIG_IP_NF_MATCH_TOS=m
2070 +CONFIG_IP_NF_MATCH_RECENT=m
2071 CONFIG_IP_NF_MATCH_ECN=m
2072 CONFIG_IP_NF_MATCH_DSCP=m
2073 CONFIG_IP_NF_MATCH_AH_ESP=m
2074 @@ -386,10 +404,9 @@
2075 CONFIG_IP_NF_TARGET_TCPMSS=m
2076 CONFIG_IP_NF_ARPTABLES=m
2077 CONFIG_IP_NF_ARPFILTER=m
2078 +CONFIG_IP_NF_ARP_MANGLE=m
2079 CONFIG_IP_NF_COMPAT_IPCHAINS=m
2080 # CONFIG_IP_NF_COMPAT_IPFWADM is not set
2081 -# CONFIG_IPV6 is not set
2082 -# CONFIG_XFRM_USER is not set
2085 # SCTP Configuration (EXPERIMENTAL)
2087 # CONFIG_ATM is not set
2088 # CONFIG_VLAN_8021Q is not set
2089 # CONFIG_LLC is not set
2090 -# CONFIG_DECNET is not set
2091 -# CONFIG_BRIDGE is not set
2092 # CONFIG_X25 is not set
2093 # CONFIG_LAPB is not set
2094 # CONFIG_NET_DIVERT is not set
2096 # CONFIG_HAMACHI is not set
2097 # CONFIG_YELLOWFIN is not set
2098 # CONFIG_R8169 is not set
2099 +# CONFIG_SIS190 is not set
2100 # CONFIG_SK98LIN is not set
2101 # CONFIG_TIGON3 is not set
2108 +# CONFIG_FB_CIRRUS is not set
2109 # CONFIG_FB_PM2 is not set
2110 # CONFIG_FB_CYBER2000 is not set
2112 @@ -602,11 +618,6 @@
2113 CONFIG_LOGO_LINUX_CLUT224=y
2116 -# Old CD-ROM drivers (not SCSI, not IDE)
2118 -# CONFIG_CD_NO_IDESCSI is not set
2121 # Input device support
2125 CONFIG_SERIO_I8042=y
2126 CONFIG_SERIO_SERPORT=y
2127 # CONFIG_SERIO_CT82C710 is not set
2128 +# CONFIG_SERIO_PCIPS2 is not set
2131 # Input Device Drivers
2132 @@ -698,10 +710,12 @@
2134 # I2C Hardware Sensors Mainboard support
2136 +# CONFIG_I2C_ALI1535 is not set
2137 # CONFIG_I2C_ALI15X3 is not set
2138 # CONFIG_I2C_AMD756 is not set
2139 # CONFIG_I2C_AMD8111 is not set
2140 # CONFIG_I2C_I801 is not set
2141 +# CONFIG_I2C_NFORCE2 is not set
2142 # CONFIG_I2C_PIIX4 is not set
2143 # CONFIG_I2C_SIS96X is not set
2144 # CONFIG_I2C_VIAPRO is not set
2146 # CONFIG_SENSORS_IT87 is not set
2147 # CONFIG_SENSORS_LM75 is not set
2148 # CONFIG_SENSORS_LM85 is not set
2149 +# CONFIG_SENSORS_LM78 is not set
2150 # CONFIG_SENSORS_VIA686A is not set
2151 # CONFIG_SENSORS_W83781D is not set
2152 # CONFIG_I2C_SENSOR is not set
2153 @@ -1047,6 +1062,7 @@
2155 # USB Network adaptors
2157 +# CONFIG_USB_AX8817X is not set
2158 # CONFIG_USB_CATC is not set
2159 # CONFIG_USB_KAWETH is not set
2160 # CONFIG_USB_PEGASUS is not set
2161 @@ -1123,7 +1139,6 @@
2164 # CONFIG_DEBUG_KERNEL is not set
2169 diff -Nru a/arch/ppc/kernel/misc.S b/arch/ppc/kernel/misc.S
2170 --- a/arch/ppc/kernel/misc.S Tue Jul 15 04:47:19 2003
2171 +++ b/arch/ppc/kernel/misc.S Fri Aug 22 19:15:18 2003
2172 @@ -1380,3 +1380,4 @@
2176 + .long ppc_fadvise64_64
2177 diff -Nru a/arch/ppc/kernel/ppc-stub.c b/arch/ppc/kernel/ppc-stub.c
2178 --- a/arch/ppc/kernel/ppc-stub.c Mon Jun 30 10:10:33 2003
2179 +++ b/arch/ppc/kernel/ppc-stub.c Thu Aug 21 15:10:37 2003
2181 #include <linux/smp.h>
2182 #include <linux/smp_lock.h>
2184 +#include <asm/cacheflush.h>
2185 #include <asm/system.h>
2186 #include <asm/signal.h>
2187 #include <asm/kgdb.h>
2191 static unsigned char *
2192 -mem2hex(char *mem, char *buf, int count)
2193 +mem2hex(const char *mem, char *buf, int count)
2196 unsigned short tmp_s;
2197 @@ -828,11 +829,11 @@
2201 - asm(" .globl breakinst
2202 - breakinst: .long 0x7d821008
2204 + asm(" .globl breakinst \n\
2205 + breakinst: .long 0x7d821008");
2208 +#ifdef CONFIG_KGDB_CONSOLE
2209 /* Output string in GDB O-packet format if GDB has connected. If nothing
2210 output, returns 0 (caller must then handle output). */
2217 diff -Nru a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c
2218 --- a/arch/ppc/kernel/ppc_ksyms.c Tue Jul 1 10:57:22 2003
2219 +++ b/arch/ppc/kernel/ppc_ksyms.c Thu Aug 21 10:51:40 2003
2221 EXPORT_SYMBOL(flush_icache_user_range);
2222 EXPORT_SYMBOL(flush_dcache_page);
2223 EXPORT_SYMBOL(flush_tlb_kernel_range);
2224 +EXPORT_SYMBOL(flush_tlb_page);
2225 #ifdef CONFIG_ALTIVEC
2226 EXPORT_SYMBOL(last_task_used_altivec);
2227 EXPORT_SYMBOL(giveup_altivec);
2228 diff -Nru a/arch/ppc/kernel/smp.c b/arch/ppc/kernel/smp.c
2229 --- a/arch/ppc/kernel/smp.c Mon Aug 18 19:46:23 2003
2230 +++ b/arch/ppc/kernel/smp.c Fri Aug 22 19:58:08 2003
2232 DEFINE_PER_CPU(unsigned int, prof_multiplier);
2233 DEFINE_PER_CPU(unsigned int, prof_counter);
2234 unsigned long cache_decay_ticks = HZ/100;
2235 -unsigned long cpu_online_map = cpumask_of_cpu(0);
2236 -unsigned long cpu_possible_map = 1UL;
2237 +cpumask_t cpu_online_map;
2238 +cpumask_t cpu_possible_map;
2239 int smp_hw_index[NR_CPUS];
2240 struct thread_info *secondary_ti;
2244 void __init smp_prepare_cpus(unsigned int max_cpus)
2249 /* Fixup boot cpu */
2250 smp_store_cpu_info(smp_processor_id());
2253 /* Probe platform for CPUs: always linear. */
2254 num_cpus = smp_ops->probe();
2255 - cpu_possible_map = (1 << num_cpus)-1;
2256 + for (i = 0; i < num_cpus; ++i)
2257 + cpu_set(i, cpu_possible_map);
2259 /* Backup CPU 0 state */
2261 diff -Nru a/arch/ppc/kernel/syscalls.c b/arch/ppc/kernel/syscalls.c
2262 --- a/arch/ppc/kernel/syscalls.c Tue Jul 15 04:49:49 2003
2263 +++ b/arch/ppc/kernel/syscalls.c Fri Aug 22 19:15:18 2003
2264 @@ -262,4 +262,14 @@
2269 + * We put the arguments in a different order so we only use 6
2270 + * registers for arguments, rather than 7 as sys_fadvise64_64 needs
2271 + * (because `offset' goes in r5/r6).
2273 +long ppc_fadvise64_64(int fd, int advice, loff_t offset, loff_t len)
2275 + return sys_fadvise64_64(fd, offset, len, advice);
2278 cond_syscall(sys_pciconfig_iobase);
2279 diff -Nru a/arch/ppc/platforms/mcpn765_serial.h b/arch/ppc/platforms/mcpn765_serial.h
2280 --- a/arch/ppc/platforms/mcpn765_serial.h Tue Feb 11 15:48:53 2003
2281 +++ b/arch/ppc/platforms/mcpn765_serial.h Mon Jul 21 09:05:22 2003
2285 /* Rate for the 1.8432 Mhz clock for the onboard serial chip */
2286 -#define BASE_BAUD ( 1843200 / 16 )
2287 +#define BASE_BAUD ( 1843200 / 16 )
2288 +#define UART_CLK 1843200
2290 #ifdef CONFIG_SERIAL_DETECT_IRQ
2291 #define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF|ASYNC_SKIP_TEST|ASYNC_AUTO_IRQ)
2292 diff -Nru a/arch/ppc/platforms/mcpn765_setup.c b/arch/ppc/platforms/mcpn765_setup.c
2293 --- a/arch/ppc/platforms/mcpn765_setup.c Wed Apr 23 00:49:34 2003
2294 +++ b/arch/ppc/platforms/mcpn765_setup.c Mon Jul 21 09:05:22 2003
2296 #include <linux/ide.h>
2297 #include <linux/seq_file.h>
2298 #include <linux/root_dev.h>
2299 +#include <linux/serial.h>
2300 +#include <linux/tty.h> /* for linux/serial_core.h */
2301 +#include <linux/serial_core.h>
2303 #include <asm/system.h>
2304 #include <asm/pgtable.h>
2306 #include <asm/pplus.h>
2308 #include "mcpn765.h"
2309 +#include "mcpn765_serial.h"
2312 static u_char mcpn765_openpic_initsenses[] __initdata = {
2313 - 0, /* 16: i8259 cascade (active high) */
2314 - 1, /* 17: COM1,2,3,4 */
2315 - 1, /* 18: Enet 1 (front panel) */
2316 - 1, /* 19: HAWK WDT XXXX */
2317 - 1, /* 20: 21554 PCI-PCI bridge */
2318 - 1, /* 21: cPCI INTA# */
2319 - 1, /* 22: cPCI INTB# */
2320 - 1, /* 23: cPCI INTC# */
2321 - 1, /* 24: cPCI INTD# */
2322 - 1, /* 25: PMC1 INTA#, PMC2 INTB# */
2323 - 1, /* 26: PMC1 INTB#, PMC2 INTC# */
2324 - 1, /* 27: PMC1 INTC#, PMC2 INTD# */
2325 - 1, /* 28: PMC1 INTD#, PMC2 INTA# */
2326 - 1, /* 29: Enet 2 (connected to J3) */
2327 - 1, /* 30: Abort Switch */
2328 - 1, /* 31: RTC Alarm */
2329 + (IRQ_SENSE_EDGE | IRQ_POLARITY_POSITIVE),/* 16: i8259 cascade */
2330 + (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),/* 17: COM1,2,3,4 */
2331 + (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),/* 18: Enet 1 (front) */
2332 + (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),/* 19: HAWK WDT XXXX */
2333 + (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),/* 20: 21554 bridge */
2334 + (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),/* 21: cPCI INTA# */
2335 + (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),/* 22: cPCI INTB# */
2336 + (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),/* 23: cPCI INTC# */
2337 + (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),/* 24: cPCI INTD# */
2338 + (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),/* 25: PMC1 INTA#,PMC2 INTB#*/
2339 + (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),/* 26: PMC1 INTB#,PMC2 INTC#*/
2340 + (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),/* 27: PMC1 INTC#,PMC2 INTD#*/
2341 + (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),/* 28: PMC1 INTD#,PMC2 INTA#*/
2342 + (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),/* 29: Enet 2 (J3) */
2343 + (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),/* 30: Abort Switch */
2344 + (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),/* 31: RTC Alarm */
2348 extern u_int openpic_irq(void);
2349 extern char cmd_line[];
2351 +extern void gen550_progress(char *, unsigned short);
2352 +extern void gen550_init(int, struct uart_port *);
2354 int use_of_interrupt_tree = 0;
2356 static void mcpn765_halt(void);
2360 +#if defined(CONFIG_SERIAL_8250) && \
2361 + (defined(CONFIG_KGDB) || defined(CONFIG_SERIAL_TEXT_DEBUG))
2363 +mcpn765_early_serial_map(void)
2365 + struct uart_port serial_req;
2367 + /* Setup serial port access */
2368 + memset(&serial_req, 0, sizeof(serial_req));
2369 + serial_req.uartclk = UART_CLK;
2370 + serial_req.irq = 17;
2371 + serial_req.flags = STD_COM_FLAGS;
2372 + serial_req.iotype = SERIAL_IO_MEM;
2373 + serial_req.membase = (u_char *)MCPN765_SERIAL_1;
2374 + serial_req.regshift = 4;
2376 + gen550_init(0, &serial_req);
2378 + if (early_serial_setup(&serial_req) != 0)
2379 + printk(KERN_ERR "Early serial init of port 0 failed\n");
2381 + /* Assume early_serial_setup() doesn't modify serial_req */
2382 + serial_req.line = 1;
2383 + serial_req.irq = 17;
2384 + serial_req.membase = (u_char *)MCPN765_SERIAL_2;
2386 + gen550_init(1, &serial_req);
2388 + if (early_serial_setup(&serial_req) != 0)
2389 + printk(KERN_ERR "Early serial init of port 1 failed\n");
2391 + /* Assume early_serial_setup() doesn't modify serial_req */
2392 + serial_req.line = 2;
2393 + serial_req.irq = 17;
2394 + serial_req.membase = (u_char *)MCPN765_SERIAL_3;
2396 + gen550_init(2, &serial_req);
2398 + if (early_serial_setup(&serial_req) != 0)
2399 + printk(KERN_ERR "Early serial init of port 2 failed\n");
2401 + /* Assume early_serial_setup() doesn't modify serial_req */
2402 + serial_req.line = 3;
2403 + serial_req.irq = 17;
2404 + serial_req.membase = (u_char *)MCPN765_SERIAL_4;
2406 + gen550_init(3, &serial_req);
2408 + if (early_serial_setup(&serial_req) != 0)
2409 + printk(KERN_ERR "Early serial init of port 3 failed\n");
2414 mcpn765_setup_arch(void)
2416 @@ -187,12 +248,12 @@
2417 if ( ppc_md.progress )
2418 ppc_md.progress("init_irq: enter", 0);
2420 - openpic_init(1, NUM_8259_INTERRUPTS, NULL, -1);
2421 + openpic_init(NUM_8259_INTERRUPTS);
2423 for(i=0; i < NUM_8259_INTERRUPTS; i++)
2424 irq_desc[i].handler = &i8259_pic;
2429 if ( ppc_md.progress )
2430 ppc_md.progress("init_irq: exit", 0);
2431 @@ -361,65 +422,15 @@
2432 static __inline__ void
2433 mcpn765_set_bat(void)
2435 - unsigned long bat3u, bat3l;
2436 - static int mapping_set = 0;
2438 - if (!mapping_set) {
2440 - __asm__ __volatile__(
2441 - " lis %0,0xf000\n \
2442 - ori %1,%0,0x002a\n \
2443 - ori %0,%0,0x1ffe\n \
2444 - mtspr 0x21e,%0\n \
2445 - mtspr 0x21f,%1\n \
2448 - : "=r" (bat3u), "=r" (bat3l));
2456 -#ifdef CONFIG_SERIAL_TEXT_DEBUG
2457 -#include <linux/serialP.h>
2458 -#include <linux/serial_reg.h>
2459 -#include <asm/serial.h>
2461 -static struct serial_state rs_table[RS_TABLE_SIZE] = {
2462 - SERIAL_PORT_DFNS /* Defined in <asm/serial.h> */
2466 -mcpn765_progress(char *s, unsigned short hex)
2469 - volatile unsigned long com_port;
2472 - com_port = rs_table[0].port;
2473 - shift = rs_table[0].iomem_reg_shift;
2475 - while ((c = *s++) != 0) {
2476 - while ((*((volatile unsigned char *)com_port +
2477 - (UART_LSR << shift)) & UART_LSR_THRE) == 0)
2479 - *(volatile unsigned char *)com_port = c;
2482 - while ((*((volatile unsigned char *)com_port +
2483 - (UART_LSR << shift)) & UART_LSR_THRE) == 0)
2485 - *(volatile unsigned char *)com_port = '\r';
2489 + mtspr(DBAT1U, 0xfe8000fe);
2490 + mtspr(DBAT1L, 0xfe80002a);
2493 -#endif /* CONFIG_SERIAL_TEXT_DEBUG */
2496 platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
2497 - unsigned long r6, unsigned long r7)
2498 + unsigned long r6, unsigned long r7)
2500 parse_bootinfo(find_bootinfo());
2502 @@ -458,11 +469,13 @@
2503 ppc_md.heartbeat_reset = 0;
2504 ppc_md.heartbeat_count = 0;
2506 -#ifdef CONFIG_SERIAL_TEXT_DEBUG
2507 - ppc_md.progress = mcpn765_progress;
2508 -#else /* !CONFIG_SERIAL_TEXT_DEBUG */
2509 - ppc_md.progress = NULL;
2510 -#endif /* CONFIG_SERIAL_TEXT_DEBUG */
2511 +#if defined(CONFIG_SERIAL_8250) && \
2512 + (defined(CONFIG_KGDB) || defined(CONFIG_SERIAL_TEXT_DEBUG))
2513 + mcpn765_early_serial_map();
2514 +#ifdef CONFIG_SERIAL_TEXT_DEBUG
2515 + ppc_md.progress = gen550_progress;
2519 #if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)
2520 ppc_ide_md.default_irq = mcpn765_ide_default_irq;
2521 diff -Nru a/arch/ppc/platforms/sandpoint.c b/arch/ppc/platforms/sandpoint.c
2522 --- a/arch/ppc/platforms/sandpoint.c Tue Jul 1 10:56:46 2003
2523 +++ b/arch/ppc/platforms/sandpoint.c Thu Aug 21 10:19:10 2003
2524 @@ -357,6 +357,21 @@
2528 + * Fix IDE interrupts.
2531 +sandpoint_fix_winbond_83553(void)
2533 + /* Make all 8259 interrupt level sensitive */
2534 + outb(0xf8, 0x4d0);
2535 + outb(0xde, 0x4d1);
2540 +arch_initcall(sandpoint_fix_winbond_83553);
2543 * Initialize the ISA devices on the Nat'l PC87308VUL SuperIO chip.
2546 @@ -390,21 +405,6 @@
2549 arch_initcall(sandpoint_setup_natl_87308);
2552 - * Fix IDE interrupts.
2555 -sandpoint_fix_winbond_83553(void)
2557 - /* Make all 8259 interrupt level sensitive */
2558 - outb(0xf8, 0x4d0);
2559 - outb(0xde, 0x4d1);
2564 -arch_initcall(sandpoint_fix_winbond_83553);
2567 sandpoint_request_io(void)
2568 diff -Nru a/arch/ppc/platforms/sandpoint.h b/arch/ppc/platforms/sandpoint.h
2569 --- a/arch/ppc/platforms/sandpoint.h Tue Jul 1 10:56:46 2003
2570 +++ b/arch/ppc/platforms/sandpoint.h Thu Aug 21 10:19:10 2003
2572 #define UART_CLK 1843200
2574 #ifdef CONFIG_SERIAL_DETECT_IRQ
2575 -#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF|ASYNC_SKIP_TEST|ASYNC_AUTO_IRQ)
2576 +#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF|ASYNC_AUTO_IRQ)
2578 -#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF|ASYNC_SKIP_TEST)
2579 +#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF)
2582 #define STD_SERIAL_PORT_DFNS \
2583 diff -Nru a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
2584 --- a/drivers/ide/ide-cd.c Wed Aug 20 09:01:03 2003
2585 +++ b/drivers/ide/ide-cd.c Fri Aug 22 18:04:49 2003
2586 @@ -794,16 +794,16 @@
2587 request or data protect error.*/
2588 ide_dump_status (drive, "command error", stat);
2590 - } else if ((err & ~ABRT_ERR) != 0) {
2591 - /* Go to the default handler
2592 - for other errors. */
2593 - DRIVER(drive)->error(drive, "cdrom_decode_status",stat);
2595 } else if (sense_key == MEDIUM_ERROR) {
2596 /* No point in re-trying a zillion times on a bad
2597 * sector... If we got here the error is not correctable */
2598 ide_dump_status (drive, "media error (bad sector)", stat);
2600 + } else if ((err & ~ABRT_ERR) != 0) {
2601 + /* Go to the default handler
2602 + for other errors. */
2603 + DRIVER(drive)->error(drive, "cdrom_decode_status",stat);
2605 } else if ((++rq->errors > ERROR_MAX)) {
2606 /* We've racked up too many retries. Abort. */
2608 diff -Nru a/drivers/input/input.c b/drivers/input/input.c
2609 --- a/drivers/input/input.c Tue Aug 12 13:29:25 2003
2610 +++ b/drivers/input/input.c Sat Aug 23 05:16:28 2003
2612 if (id->id.product != dev->id.product)
2615 - if (id->flags & INPUT_DEVICE_ID_MATCH_BUS)
2616 + if (id->flags & INPUT_DEVICE_ID_MATCH_VERSION)
2617 if (id->id.version != dev->id.version)
2620 diff -Nru a/include/asm-ppc/cpm_8260.h b/include/asm-ppc/cpm_8260.h
2621 --- a/include/asm-ppc/cpm_8260.h Sun Sep 15 21:52:03 2002
2622 +++ b/include/asm-ppc/cpm_8260.h Thu Aug 21 15:26:43 2003
2625 /* SMC uart mode register (Internal memory map).
2627 -#define SMCMR_REN ((ushort)0x0001)
2628 +#define SMCMR_REN ((ushort)0x0001)
2629 #define SMCMR_TEN ((ushort)0x0002)
2630 #define SMCMR_DM ((ushort)0x000c)
2631 #define SMCMR_SM_GCI ((ushort)0x0000)
2632 @@ -212,10 +212,12 @@
2634 /* SMC Event and Mask register.
2636 -#define SMCM_TXE ((unsigned char)0x10)
2637 -#define SMCM_BSY ((unsigned char)0x04)
2638 -#define SMCM_TX ((unsigned char)0x02)
2639 -#define SMCM_RX ((unsigned char)0x01)
2640 +#define SMCM_BRKE ((unsigned char)0x40) /* When in UART Mode */
2641 +#define SMCM_BRK ((unsigned char)0x10) /* When in UART Mode */
2642 +#define SMCM_TXE ((unsigned char)0x10)
2643 +#define SMCM_BSY ((unsigned char)0x04)
2644 +#define SMCM_TX ((unsigned char)0x02)
2645 +#define SMCM_RX ((unsigned char)0x01)
2647 /* Baud rate generators.
2649 @@ -314,10 +316,10 @@
2651 /* SCC Event and Mask register.
2653 -#define SCCM_TXE ((unsigned char)0x10)
2654 -#define SCCM_BSY ((unsigned char)0x04)
2655 -#define SCCM_TX ((unsigned char)0x02)
2656 -#define SCCM_RX ((unsigned char)0x01)
2657 +#define SCCM_TXE ((unsigned char)0x10)
2658 +#define SCCM_BSY ((unsigned char)0x04)
2659 +#define SCCM_TX ((unsigned char)0x02)
2660 +#define SCCM_RX ((unsigned char)0x01)
2662 typedef struct scc_param {
2663 ushort scc_rbase; /* Rx Buffer descriptor base address */
2664 diff -Nru a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h
2665 --- a/include/asm-ppc/processor.h Wed Jul 16 20:41:10 2003
2666 +++ b/include/asm-ppc/processor.h Fri Aug 22 05:26:16 2003
2671 +#define MCA_bus__is_a_macro
2673 /* Lazy FPU handling on uni-processor */
2674 extern struct task_struct *last_task_used_math;
2675 diff -Nru a/include/asm-ppc/unistd.h b/include/asm-ppc/unistd.h
2676 --- a/include/asm-ppc/unistd.h Tue Jul 15 04:47:19 2003
2677 +++ b/include/asm-ppc/unistd.h Fri Aug 22 19:15:18 2003
2679 #define __NR_utimes 251
2680 #define __NR_statfs64 252
2681 #define __NR_fstatfs64 253
2682 +#define __NR_fadvise64_64 254
2684 -#define __NR_syscalls 254
2685 +#define __NR_syscalls 255
2689 diff -Nru a/sound/pcmcia/vx/vx_entry.c b/sound/pcmcia/vx/vx_entry.c
2690 --- a/sound/pcmcia/vx/vx_entry.c Tue Jun 10 07:32:30 2003
2691 +++ b/sound/pcmcia/vx/vx_entry.c Fri Aug 22 05:02:18 2003
2693 static int vxpocket_event(event_t event, int priority, event_callback_args_t *args);
2696 -static void vxpocket_release(u_long arg)
2697 +static void vxpocket_release(dev_link_t* link)
2699 - dev_link_t *link = (dev_link_t *)arg;
2701 if (link->state & DEV_CONFIG) {
2702 /* release cs resources */
2703 CardServices(ReleaseConfiguration, link->handle);
2705 struct snd_vxp_entry *hw;
2706 dev_link_t *link = &vxp->link;
2708 - vxpocket_release((u_long)link);
2709 + vxpocket_release(link);
2711 /* Break the link with Card Services */
2714 link->irq.Handler = &snd_vx_irq_handler;
2715 link->irq.Instance = chip;
2717 - link->release.function = &vxpocket_release;
2718 - link->release.data = (u_long)link;
2720 link->conf.Attributes = CONF_ENABLE_IRQ;
2721 link->conf.Vcc = 50;
2722 link->conf.IntType = INT_MEMORY_AND_IO;
2725 vx_core_t *chip = snd_magic_cast(vx_core_t, link->priv, return);
2727 - del_timer(&link->release);
2729 snd_printdd(KERN_DEBUG "vxpocket_detach called\n");
2730 /* Remove the interface data from the linked list */
2733 snd_printdd(KERN_DEBUG "CARD_REMOVAL..\n");
2734 link->state &= ~DEV_PRESENT;
2735 if (link->state & DEV_CONFIG) {
2736 - mod_timer(&link->release, jiffies + HZ/20);
2737 chip->chip_status |= VX_STAT_IS_STALE;