simple patches for Linux 2.4.9-ac5 or Linux 2.4.10-pre2 on PPC

simple patches for Linux 2.4.9-ac5 or Linux 2.4.10-pre2 on PPC

[Tsunehiko Baba]

[-- Attachment #1: Type: text/plain, Size: 219 bytes --]


Hi, All.

I tried to compile 2.4.10-pre2 or 2.4.9-ac5 on ppc but failed.
To avoid some errors, I made following patches.
Please check and apply these patches. 

Best Regards.
--
Tsunehiko Baba <tsn@crl.hitachi.co.jp>


[-- Attachment #2: Type: text/plain, Size: 2021 bytes --]

*** include/linux/vt_kern.h.orig	Thu Aug 30 20:22:52 2001
--- include/linux/vt_kern.h	Thu Aug 30 20:28:35 2001
***************
*** 32,38 ****
  } *vt_cons[MAX_NR_CONSOLES];
  
  extern void (*kd_mksound)(unsigned int hz, unsigned int ticks);
! extern int (*kbd_rate)(struct kbd_repeat *rep);
  
  /* console.c */
  
--- 32,38 ----
  } *vt_cons[MAX_NR_CONSOLES];
  
  extern void (*kd_mksound)(unsigned int hz, unsigned int ticks);
! extern int (*kbd_rate_fn)(struct kbd_repeat *rep);
  
  /* console.c */
  
*** drivers/char/pc_keyb.c.orig	Thu Aug 30 20:50:47 2001
--- drivers/char/pc_keyb.c	Thu Aug 30 20:53:28 2001
***************
*** 603,609 ****
  		return 1;
  }
  
! static int pckbd_rate(struct kbd_repeat *rep)
  {
  	if (rep == NULL)
  		return -EINVAL;
--- 603,609 ----
  		return 1;
  }
  
! int pckbd_rate(struct kbd_repeat *rep)
  {
  	if (rep == NULL)
  		return -EINVAL;
*** drivers/ide/ide-pci.c.orig	Mon Aug 13 17:56:19 2001
--- drivers/ide/ide-pci.c	Thu Aug 30 20:55:38 2001
***************
*** 445,451 ****
   * settings of split-mirror pci-config space, place chipset into init-mode,
   * and/or preserve an interrupt if the card is not native ide support.
   */
! static unsigned int __init ide_special_settings (struct pci_dev *dev, const char *name)
  {
  	switch(dev->device) {
  		case PCI_DEVICE_ID_TTI_HPT366:
--- 445,451 ----
   * settings of split-mirror pci-config space, place chipset into init-mode,
   * and/or preserve an interrupt if the card is not native ide support.
   */
! unsigned int __init ide_special_settings (struct pci_dev *dev, const char *name)
  {
  	switch(dev->device) {
  		case PCI_DEVICE_ID_TTI_HPT366:
*** drivers/ide/sl82c105.c.orig	Wed Jun 27 17:12:04 2001
--- drivers/ide/sl82c105.c	Thu Aug 30 20:56:52 2001
***************
*** 27,32 ****
--- 27,33 ----
  #include "ide_modes.h"
  
  extern char *ide_xfer_verbose (byte xfer_rate);
+ extern unsigned int __init ide_special_settings (struct pci_dev *dev, const char *name);
  
  #ifdef CONFIG_ARCH_NETWINDER
  /*

Re: simple patches for Linux 2.4.9-ac5 or Linux 2.4.10-pre2 on PPC

[Paul Mackerras]

Tsunehiko Baba writes:

> I tried to compile 2.4.10-pre2 or 2.4.9-ac5 on ppc but failed.
> To avoid some errors, I made following patches.
> Please check and apply these patches. 

> *** include/linux/vt_kern.h.orig	Thu Aug 30 20:22:52 2001
> --- include/linux/vt_kern.h	Thu Aug 30 20:28:35 2001

A simpler and better solution for this is to just remove the
definition of kbd_rate from include/asm-ppc/keyboard.h and remove the
lines which reference pckbd_rate from arch/ppc/kernel/chrp_setup.c and
prep_setup.c.  I have sent Linus a patch to this effect already.

> *** drivers/ide/ide-pci.c.orig	Mon Aug 13 17:56:19 2001
> --- drivers/ide/ide-pci.c	Thu Aug 30 20:55:38 2001
> ***************
> *** 445,451 ****
>    * settings of split-mirror pci-config space, place chipset into init-mode,
>    * and/or preserve an interrupt if the card is not native ide support.
>    */
> ! static unsigned int __init ide_special_settings (struct pci_dev *dev, const char *name)

The better fix is to go into drivers/ide/sl82c105.c and change it to
use the code that is currently inside the #ifdef CONFIG_ARCH_NETWINDER
block instead of the code that is in the #else branch of that
conditional.  I have posted that patch to lkml a couple of times and
sent to Linus as well, but he hasn't taken it yet (Alan has).
Alternatively, if you don't use the sl82c105 driver, remove it from
your config.

Paul.

-- 
Paul Mackerras, PPC/Linux Maintainer		paulus@samba.org