--- linux-2.4.34/arch/i386/boot/Makefile.~1~ 2001-08-12 11:35:51.000000000 +0200 +++ linux-2.4.34/arch/i386/boot/Makefile 2006-12-24 12:19:08.000000000 +0100 @@ -27,7 +27,7 @@ compressed/bvmlinux: $(TOPDIR)/vmlinux @$(MAKE) -C compressed bvmlinux zdisk: $(BOOTIMAGE) - dd bs=8192 if=$(BOOTIMAGE) of=/dev/fd0 + if type -p make-zdisk > /dev/null; then make-zdisk $(BOOTIMAGE); else dd bs=8192 if=$(BOOTIMAGE) of=/dev/fd0; fi zlilo: $(CONFIGURE) $(BOOTIMAGE) if [ -f $(INSTALL_PATH)/vmlinuz ]; then mv $(INSTALL_PATH)/vmlinuz $(INSTALL_PATH)/vmlinuz.old; fi --- linux-2.4.34/arch/i386/boot/bootsect.S.~1~ 2003-08-25 20:07:40.000000000 +0200 +++ linux-2.4.34/arch/i386/boot/bootsect.S 2006-12-24 12:19:08.000000000 +0100 @@ -237,7 +237,7 @@ rp_read: #ifdef __BIG_KERNEL__ # look in setup.S for bootsect_kludge bootsect_kludge = 0x220 # 0x200 + 0x20 which is the size of the - lcall bootsect_kludge # bootsector + bootsect_kludge offset + lcall *bootsect_kludge # bootsector + bootsect_kludge offset #else movw %es, %ax subw $SYSSEG, %ax --- linux-2.4.34/arch/i386/boot/setup.S.~1~ 2004-02-18 15:16:21.000000000 +0100 +++ linux-2.4.34/arch/i386/boot/setup.S 2006-12-24 12:19:08.000000000 +0100 @@ -637,7 +637,7 @@ edd_done: cmpw $0, %cs:realmode_swtch jz rmodeswtch_normal - lcall %cs:realmode_swtch + lcall *%cs:realmode_swtch jmp rmodeswtch_end --- linux-2.4.34/arch/i386/kernel/apm.c.~1~ 2005-11-17 13:27:30.000000000 +0100 +++ linux-2.4.34/arch/i386/kernel/apm.c 2006-12-24 12:19:08.000000000 +0100 @@ -614,7 +614,7 @@ static u8 apm_bios_call(u32 func, u32 eb __asm__ __volatile__(APM_DO_ZERO_SEGS "pushl %%edi\n\t" "pushl %%ebp\n\t" - "lcall %%cs:" SYMBOL_NAME_STR(apm_bios_entry) "\n\t" + "lcall *%%cs:" SYMBOL_NAME_STR(apm_bios_entry) "\n\t" "setc %%al\n\t" "popl %%ebp\n\t" "popl %%edi\n\t" @@ -666,7 +666,7 @@ static u8 apm_bios_call_simple(u32 func, __asm__ __volatile__(APM_DO_ZERO_SEGS "pushl %%edi\n\t" "pushl %%ebp\n\t" - "lcall %%cs:" SYMBOL_NAME_STR(apm_bios_entry) "\n\t" + "lcall *%%cs:" SYMBOL_NAME_STR(apm_bios_entry) "\n\t" "setc %%bl\n\t" "popl %%ebp\n\t" "popl %%edi\n\t" --- linux-2.4.34/arch/i386/kernel/nmi.c.~1~ 2003-06-14 13:30:19.000000000 +0200 +++ linux-2.4.34/arch/i386/kernel/nmi.c 2006-12-24 12:19:08.000000000 +0100 @@ -25,7 +25,7 @@ #include #include -unsigned int nmi_watchdog = NMI_NONE; +unsigned int nmi_watchdog = NMI_LOCAL_APIC; static unsigned int nmi_hz = HZ; unsigned int nmi_perfctr_msr; /* the MSR to reset in NMI handler */ extern void show_registers(struct pt_regs *regs); --- linux-2.4.34/arch/i386/kernel/pci-pc.c.~1~ 2004-11-17 18:36:41.000000000 +0100 +++ linux-2.4.34/arch/i386/kernel/pci-pc.c 2006-12-24 12:19:08.000000000 +0100 @@ -594,7 +594,7 @@ static unsigned long bios32_service(unsi unsigned long flags; __save_flags(flags); __cli(); - __asm__("lcall (%%edi); cld" + __asm__("lcall *(%%edi); cld" : "=a" (return_code), "=b" (address), "=c" (length), @@ -635,7 +635,7 @@ static int __devinit check_pcibios(void) __save_flags(flags); __cli(); __asm__( - "lcall (%%edi); cld\n\t" + "lcall *(%%edi); cld\n\t" "jc 1f\n\t" "xor %%ah, %%ah\n" "1:" @@ -680,7 +680,7 @@ static int __devinit pci_bios_find_devic unsigned short bx; unsigned short ret; - __asm__("lcall (%%edi); cld\n\t" + __asm__("lcall *(%%edi); cld\n\t" "jc 1f\n\t" "xor %%ah, %%ah\n" "1:" @@ -709,7 +709,7 @@ static int pci_bios_read (int seg, int b switch (len) { case 1: - __asm__("lcall (%%esi); cld\n\t" + __asm__("lcall *(%%esi); cld\n\t" "jc 1f\n\t" "xor %%ah, %%ah\n" "1:" @@ -721,7 +721,7 @@ static int pci_bios_read (int seg, int b "S" (&pci_indirect)); break; case 2: - __asm__("lcall (%%esi); cld\n\t" + __asm__("lcall *(%%esi); cld\n\t" "jc 1f\n\t" "xor %%ah, %%ah\n" "1:" @@ -733,7 +733,7 @@ static int pci_bios_read (int seg, int b "S" (&pci_indirect)); break; case 4: - __asm__("lcall (%%esi); cld\n\t" + __asm__("lcall *(%%esi); cld\n\t" "jc 1f\n\t" "xor %%ah, %%ah\n" "1:" @@ -764,7 +764,7 @@ static int pci_bios_write (int seg, int switch (len) { case 1: - __asm__("lcall (%%esi); cld\n\t" + __asm__("lcall *(%%esi); cld\n\t" "jc 1f\n\t" "xor %%ah, %%ah\n" "1:" @@ -776,7 +776,7 @@ static int pci_bios_write (int seg, int "S" (&pci_indirect)); break; case 2: - __asm__("lcall (%%esi); cld\n\t" + __asm__("lcall *(%%esi); cld\n\t" "jc 1f\n\t" "xor %%ah, %%ah\n" "1:" @@ -788,7 +788,7 @@ static int pci_bios_write (int seg, int "S" (&pci_indirect)); break; case 4: - __asm__("lcall (%%esi); cld\n\t" + __asm__("lcall *(%%esi); cld\n\t" "jc 1f\n\t" "xor %%ah, %%ah\n" "1:" @@ -1011,7 +1011,7 @@ struct irq_routing_table * __devinit pci __asm__("push %%es\n\t" "push %%ds\n\t" "pop %%es\n\t" - "lcall (%%esi); cld\n\t" + "lcall *(%%esi); cld\n\t" "pop %%es\n\t" "jc 1f\n\t" "xor %%ah, %%ah\n" @@ -1047,7 +1047,7 @@ int pcibios_set_irq_routing(struct pci_d { int ret; - __asm__("lcall (%%esi); cld\n\t" + __asm__("lcall *(%%esi); cld\n\t" "jc 1f\n\t" "xor %%ah, %%ah\n" "1:" --- linux-2.4.34/arch/ppc/Makefile.~1~ 2004-04-14 20:22:20.000000000 +0200 +++ linux-2.4.34/arch/ppc/Makefile 2006-12-24 12:19:08.000000000 +0100 @@ -90,6 +90,10 @@ BOOT_TARGETS = zImage zImage.initrd znet # All the instructions talk about "make bzImage". bzImage: zImage +bzdisk.coff: zImage arch/ppc/boot/images/vmlinux.coff + hformat /dev/fd0 + hcopy arch/ppc/boot/images/vmlinux.coff : + $(BOOT_TARGETS): vmlinux @$(MAKEBOOT) $@ --- linux-2.4.34/arch/x86_64/boot/Makefile.~1~ 2002-11-30 17:12:24.000000000 +0100 +++ linux-2.4.34/arch/x86_64/boot/Makefile 2006-12-24 12:19:08.000000000 +0100 @@ -30,7 +30,7 @@ compressed/bvmlinux: $(TOPDIR)/vmlinux @$(MAKE) -C compressed bvmlinux zdisk: $(BOOTIMAGE) - dd bs=8192 if=$(BOOTIMAGE) of=/dev/fd0 + if type -p make-zdisk > /dev/null; then make-zdisk $(BOOTIMAGE); else dd bs=8192 if=$(BOOTIMAGE) of=/dev/fd0; fi zlilo: $(CONFIGURE) $(BOOTIMAGE) if [ -f $(INSTALL_PATH)/vmlinuz ]; then mv $(INSTALL_PATH)/vmlinuz $(INSTALL_PATH)/vmlinuz.old; fi --- linux-2.4.34/arch/x86_64/boot/install.sh.~1~ 2002-11-30 17:12:24.000000000 +0100 +++ linux-2.4.34/arch/x86_64/boot/install.sh 2006-12-24 12:19:08.000000000 +0100 @@ -21,6 +21,7 @@ # User may have a custom install script +if [ -x ~/bin/installkernel ]; then exec ~/bin/installkernel "$@"; fi if [ -x /sbin/installkernel ]; then exec /sbin/installkernel "$@"; fi # Default install - same as make zlilo --- linux-2.4.34/drivers/ide/ide-dma.c.~1~ 2006-08-11 11:46:17.000000000 +0200 +++ linux-2.4.34/drivers/ide/ide-dma.c 2006-12-24 12:19:08.000000000 +0100 @@ -114,7 +114,7 @@ struct drive_list_entry drive_blacklist { "WDC AC11000H" , "ALL" }, { "WDC AC22100H" , "ALL" }, - { "WDC AC32500H" , "ALL" }, +/* { "WDC AC32500H" , "ALL" },*//*mikpe*/ { "WDC AC33100H" , "ALL" }, { "WDC AC31600H" , "ALL" }, { "WDC AC32100H" , "24.09P07" }, @@ -196,7 +196,7 @@ const char *good_dma_drives[] = {"Microp const char *bad_dma_drives[] = {"WDC AC11000H", "WDC AC22100H", "WDC AC32100H", - "WDC AC32500H", +/* "WDC AC32500H",*//*mikpe*/ "WDC AC33100H", "WDC AC31600H", NULL}; --- linux-2.4.34/drivers/ide/ide.c.~1~ 2004-08-08 10:56:31.000000000 +0200 +++ linux-2.4.34/drivers/ide/ide.c 2006-12-24 12:19:08.000000000 +0100 @@ -2149,6 +2149,9 @@ int __init ide_setup (char *s) if (strncmp(s,"hd",2) == 0 && s[2] == '=') /* hd= is for hd.c */ return 0; /* driver and not us */ + if (!strncmp(s, "idescsi=", 8)) /* for ide-scsi.c not us */ + return 0; + if (strncmp(s,"ide",3) && strncmp(s,"idebus",6) && strncmp(s,"hd",2)) /* hdx= & hdxlun= */ --- linux-2.4.34/drivers/net/sunhme.c.~1~ 2003-11-29 00:28:12.000000000 +0100 +++ linux-2.4.34/drivers/net/sunhme.c 2006-12-24 12:19:08.000000000 +0100 @@ -732,8 +732,10 @@ static void happy_meal_timer(unsigned lo /* Enter force mode. */ do_force_mode: hp->sw_bmcr = happy_meal_tcvr_read(hp, tregs, MII_BMCR); +#if 0 printk(KERN_NOTICE "%s: Auto-Negotiation unsuccessful, trying force link mode\n", hp->dev->name); +#endif hp->sw_bmcr = BMCR_SPEED100; happy_meal_tcvr_write(hp, tregs, MII_BMCR, hp->sw_bmcr); @@ -848,8 +850,10 @@ static void happy_meal_timer(unsigned lo */ /* Let the user know... */ +#if 0 printk(KERN_NOTICE "%s: Link down, cable problem?\n", hp->dev->name); +#endif ret = happy_meal_init(hp); if (ret) { --- linux-2.4.34/drivers/scsi/ide-scsi.c.~1~ 2005-01-19 18:00:53.000000000 +0100 +++ linux-2.4.34/drivers/scsi/ide-scsi.c 2006-12-24 12:19:08.000000000 +0100 @@ -771,6 +771,18 @@ static ide_module_t idescsi_module = { NULL }; +static char *units; +#ifdef MODULE +MODULE_PARM(units, "s"); +#else +static int __init setup_idescsi(char *s) +{ + units = s; + return 1; +} +__setup("idescsi=", setup_idescsi); +#endif + int idescsi_attach (ide_drive_t *drive) { idescsi_scsi_t *scsi; @@ -868,6 +880,10 @@ int idescsi_init (void) failed = 0; while ((drive = ide_scan_devices(media[i], idescsi_driver.name, NULL, failed++)) != NULL) { + if (units && !strstr(units, drive->name)) { + printk("ide-scsi: ignoring unit %s\n", drive->name); + continue; + } #ifdef MODULE /* skip drives we were told to ignore */ if (ignore != NULL && strstr(ignore, drive->name)) { --- linux-2.4.34/include/linux/pci_gameport.h.~1~ 2002-11-30 17:12:31.000000000 +0100 +++ linux-2.4.34/include/linux/pci_gameport.h 2006-12-24 12:19:08.000000000 +0100 @@ -32,8 +32,11 @@ struct pcigame { extern struct pcigame *pcigame_attach(struct pci_dev *dev, int type); extern void pcigame_detach(struct pcigame *game); #else -#define pcigame_attach(a,b) NULL -#define pcigame_detach(a) +static inline struct pcigame *pcigame_attach(struct pci_dev *dev, int type) +{ + return NULL; +} +static inline void pcigame_detach(struct pcigame *game) { } #endif #endif --- linux-2.4.34/scripts/Configure.~1~ 2005-04-04 19:56:05.000000000 +0200 +++ linux-2.4.34/scripts/Configure 2006-12-24 12:19:08.000000000 +0100 @@ -255,7 +255,13 @@ function dep_tristate () { return ;; m) - need_module=1 + # Note: "m" means "module" only when CONFIG_MODULES=y, + # otherwise it really means "y". This matters when + # a dep_tristate dependency is a forward reference + # which we haven't yet "corrected" from "m" to "y". + if [ "$CONFIG_MODULES" = "y" ]; then + need_module=1 + fi ;; esac shift