]> git.pld-linux.org Git - packages/kernel.git/blob - linux-2.4.18-nousb.patch
- added description of djurban's branch
[packages/kernel.git] / linux-2.4.18-nousb.patch
1 diff -urNp linux-900/drivers/usb/hcd/ehci-hcd.c linux-1000/drivers/usb/hcd/ehci-hcd.c
2 --- linux-900/drivers/usb/hcd/ehci-hcd.c        
3 +++ linux-1000/drivers/usb/hcd/ehci-hcd.c       
4 @@ -999,8 +999,11 @@ MODULE_DESCRIPTION (DRIVER_INFO);
5  MODULE_AUTHOR (DRIVER_AUTHOR);
6  MODULE_LICENSE ("GPL");
7  
8 +extern int disable_all_usb;
9  static int __init init (void) 
10  {
11 +       if (disable_all_usb)
12 +               return -ENODEV;
13         dbg (DRIVER_INFO);
14         dbg ("block sizes: qh %Zd qtd %Zd itd %Zd sitd %Zd",
15                 sizeof (struct ehci_qh), sizeof (struct ehci_qtd),
16 diff -urNp linux-900/drivers/usb/uhci.c linux-1000/drivers/usb/uhci.c
17 --- linux-900/drivers/usb/uhci.c        
18 +++ linux-1000/drivers/usb/uhci.c       
19 @@ -3099,10 +3099,14 @@ static struct pci_driver uhci_pci_driver
20  #endif /* PM */
21  };
22  
23 +extern int disable_all_usb; 
24   
25  static int __init uhci_hcd_init(void)
26  {
27         int retval = -ENOMEM;
28 +       
29 +       if (disable_all_usb)
30 +               return -ENODEV;
31  
32         info(DRIVER_DESC " " DRIVER_VERSION);
33  
34 diff -urNp linux-900/drivers/usb/usb-ohci.c linux-1000/drivers/usb/usb-ohci.c
35 --- linux-900/drivers/usb/usb-ohci.c    
36 +++ linux-1000/drivers/usb/usb-ohci.c   
37 @@ -2919,9 +2919,12 @@ static struct pci_driver ohci_pci_driver
38  
39   
40  /*-------------------------------------------------------------------------*/
41 +extern int disable_all_usb;
42  
43  static int __init ohci_hcd_init (void) 
44  {
45 +       if (disable_all_usb)
46 +               return -ENODEV;
47         return pci_module_init (&ohci_pci_driver);
48  }
49  
50 diff -urNp linux-900/drivers/usb/usb-uhci.c linux-1000/drivers/usb/usb-uhci.c
51 --- linux-900/drivers/usb/usb-uhci.c    
52 +++ linux-1000/drivers/usb/usb-uhci.c   
53 @@ -3091,10 +3091,14 @@ static struct pci_driver uhci_pci_driver
54  };
55  
56  /*-------------------------------------------------------------------------*/
57 +extern int disable_all_usb;
58  
59  static int __init uhci_hcd_init (void) 
60  {
61         int retval;
62 +       
63 +       if (disable_all_usb)
64 +               return -ENODEV;
65  
66  #ifdef DEBUG_SLAB
67         urb_priv_kmem = kmem_cache_create("urb_priv", sizeof(urb_priv_t), 0, SLAB_HWCACHE_ALIGN, NULL, NULL);
68 diff -urNp linux-900/init/main.c linux-1000/init/main.c
69 --- linux-900/init/main.c       
70 +++ linux-1000/init/main.c      
71 @@ -132,6 +132,15 @@ static int __init profile_setup(char *st
72  
73  __setup("profile=", profile_setup);
74  
75 +int disable_all_usb = 0;
76 +static int __init no_usb(char * s)
77 +{
78 +       disable_all_usb = 1;
79 +       return 1;
80 +}
81 +__setup("nousb", no_usb);
82 +
83 +
84  static int __init checksetup(char *line)
85  {
86         struct kernel_param *p;
87 diff -urNp linux-900/kernel/ksyms.c linux-1000/kernel/ksyms.c
88 --- linux-900/kernel/ksyms.c    
89 +++ linux-1000/kernel/ksyms.c   
90 @@ -529,6 +529,8 @@ EXPORT_SYMBOL(seq_open);
91  EXPORT_SYMBOL(seq_release);
92  EXPORT_SYMBOL(seq_read);
93  EXPORT_SYMBOL(seq_lseek);
94 +extern int disable_all_usb;
95 +EXPORT_SYMBOL(disable_all_usb);
96  
97  /* Program loader interfaces */
98  EXPORT_SYMBOL(setup_arg_pages);
This page took 0.261647 seconds and 3 git commands to generate.