diff -u -r rc6-rt0/linux-2.6.20/arch/ppc/Kconfig linux-2.6.20/arch/ppc/Kconfig --- rc6-rt0/linux-2.6.20/arch/ppc/Kconfig 2007-04-18 16:41:56.000000000 +0530 +++ linux-2.6.20/arch/ppc/Kconfig 2007-04-18 12:05:31.000000000 +0530 @@ -58,6 +58,14 @@ default y depends on BUG +config TRACE_IRQFLAGS_SUPPORT + bool + default y + +config GENERIC_TIME + bool + default y + source "init/Kconfig" menu "Processor" diff -u -r rc6-rt0/linux-2.6.20/arch/ppc/kernel/time.c linux-2.6.20/arch/ppc/kernel/time.c --- rc6-rt0/linux-2.6.20/arch/ppc/kernel/time.c 2007-04-18 16:41:56.000000000 +0530 +++ linux-2.6.20/arch/ppc/kernel/time.c 2007-04-18 13:14:44.000000000 +0530 @@ -200,6 +200,7 @@ /* * This version of gettimeofday has microsecond resolution. */ +#ifndef CONFIG_GENERIC_TIME void do_gettimeofday(struct timeval *tv) { unsigned long flags; @@ -282,6 +283,7 @@ } EXPORT_SYMBOL(do_settimeofday); +#endif /* !CONFIG_GENERIC_TIME */ /* This function is only called on the boot processor */ void __init time_init(void) Only in linux-2.6.20/: .config Only in linux-2.6.20/: .config.old diff -u -r rc6-rt0/linux-2.6.20/drivers/mtd/maps/Kconfig linux-2.6.20/drivers/mtd/maps/Kconfig --- rc6-rt0/linux-2.6.20/drivers/mtd/maps/Kconfig 2007-04-18 16:41:41.000000000 +0530 +++ linux-2.6.20/drivers/mtd/maps/Kconfig 2007-04-18 15:21:31.000000000 +0530 @@ -374,6 +374,18 @@ Redwood board. If you have one of these boards and would like to use the flash chips on it, say 'Y'. +config MTD_LITE5200 + tristate "CFI Flash devices mapped on Metrowerks Lite5200" + depends on MTD_CFI && PPC_MPC52xx && LITE5200 + +config MTD_LITE5200B + tristate "CFI Flash devices mapped on Freescale Lite5200B" + depends on MTD_CFI && PPC_MPC52xx && LITE5200B + +config MTD_MEDIA5200 + tristate "CFI Flash devices mapped on Freescale Media5200" + depends on MTD_CFI && PPC_MPC52xx && MEDIA5200 + config MTD_TQM834x tristate "Flash device mapped on TQ Components TQM834x Boards" depends on MTD_CFI && TQM834x Only in linux-2.6.20/drivers/mtd/maps: Kconfig.orig Only in linux-2.6.20/drivers/mtd/maps: lite5200.c diff -u -r rc6-rt0/linux-2.6.20/drivers/mtd/maps/Makefile linux-2.6.20/drivers/mtd/maps/Makefile --- rc6-rt0/linux-2.6.20/drivers/mtd/maps/Makefile 2007-02-05 00:14:54.000000000 +0530 +++ linux-2.6.20/drivers/mtd/maps/Makefile 2007-04-18 15:21:31.000000000 +0530 @@ -51,6 +51,10 @@ obj-$(CONFIG_MTD_IMPA7) += impa7.o obj-$(CONFIG_MTD_FORTUNET) += fortunet.o obj-$(CONFIG_MTD_REDWOOD) += redwood.o +obj-$(CONFIG_MTD_LITE5200) += lite5200.o +obj-$(CONFIG_MTD_LITE5200B) += lite5200.o +obj-$(CONFIG_MTD_MEDIA5200) += media5200.o +obj-$(CONFIG_MTD_CHESTNUT) += chestnut.o obj-$(CONFIG_MTD_UCLINUX) += uclinux.o obj-$(CONFIG_MTD_NETtel) += nettel.o obj-$(CONFIG_MTD_SCB2_FLASH) += scb2_flash.o Only in linux-2.6.20/drivers/mtd/maps: Makefile.orig Only in linux-2.6.20/drivers/mtd/maps: media5200.c Only in linux-2.6.20/include: asm diff -u -r rc6-rt0/linux-2.6.20/include/asm-powerpc/irqflags.h linux-2.6.20/include/asm-powerpc/irqflags.h --- rc6-rt0/linux-2.6.20/include/asm-powerpc/irqflags.h 2007-02-05 00:14:54.000000000 +0530 +++ linux-2.6.20/include/asm-powerpc/irqflags.h 2007-04-18 12:05:08.000000000 +0530 @@ -14,14 +14,18 @@ * Get definitions for raw_local_save_flags(x), etc. */ #include - /* * Do the CPU's IRQ-state tracing from assembly code. We call a * C function, so save all the C-clobbered registers: */ #ifdef CONFIG_TRACE_IRQFLAGS -#error No support on PowerPC yet for CONFIG_TRACE_IRQFLAGS +//#error No support on PowerPC yet for CONFIG_TRACE_IRQFLAGS +#define TRACE_IRQS_ON \ + bl trace_hardirqs_on; \ + +#define TRACE_IRQS_OFF \ + bl trace_hardirqs_off; \ #else # define TRACE_IRQS_ON Only in linux-2.6.20/include: config Only in linux-2.6.20/include/linux: autoconf.h Only in linux-2.6.20/include/linux: utsrelease.h Only in linux-2.6.20/include/linux: version.h diff -u -r rc6-rt0/linux-2.6.20/Makefile linux-2.6.20/Makefile --- rc6-rt0/linux-2.6.20/Makefile 2007-04-18 16:41:56.000000000 +0530 +++ linux-2.6.20/Makefile 2007-04-18 16:39:07.000000000 +0530 @@ -1,8 +1,8 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 21 -EXTRAVERSION = -rc6-rt0 -NAME = Nocturnal Monster Puppy +EXTRAVERSION = -rc6-rt0-pr0 +NAME = incrc black dustbins # *DOCUMENTATION* # To see a list of typical targets execute "make help" Only in linux-2.6.20/: Module.symvers Only in linux-2.6.20/scripts/basic: docproc Only in linux-2.6.20/scripts/basic: fixdep Only in linux-2.6.20/scripts: conmakehash Only in linux-2.6.20/scripts/genksyms: genksyms Only in linux-2.6.20/scripts/genksyms: keywords.c Only in linux-2.6.20/scripts/genksyms: lex.c Only in linux-2.6.20/scripts/genksyms: parse.c Only in linux-2.6.20/scripts/genksyms: parse.h Only in linux-2.6.20/scripts: kallsyms Only in linux-2.6.20/scripts/kconfig: conf Only in linux-2.6.20/scripts/kconfig: lex.zconf.c Only in linux-2.6.20/scripts/kconfig: mconf Only in linux-2.6.20/scripts/kconfig: zconf.hash.c Only in linux-2.6.20/scripts/kconfig: zconf.tab.c Only in linux-2.6.20/scripts/mod: elfconfig.h Only in linux-2.6.20/scripts/mod: mk_elfconfig Only in linux-2.6.20/scripts/mod: modpost Only in linux-2.6.20/scripts: trace-it Only in linux-2.6.20/: .version