[packages/kernel.git] / linux-2.4.21-nousb.patch

diff -urN linux-2.4.22.org/drivers/usb/host/ehci-hcd.c linux-2.4.22/drivers/usb/host/ehci-hcd.c
--- linux-2.4.22.org/drivers/usb/host/ehci-hcd.c	2003-11-21 19:50:57.000000000 +0100
+++ linux-2.4.22/drivers/usb/host/ehci-hcd.c	2003-11-21 19:59:22.000000000 +0100
@@ -1041,8 +1041,11 @@
 MODULE_AUTHOR (DRIVER_AUTHOR);
 MODULE_LICENSE ("GPL");
 
+extern int disable_all_usb;
 static int __init init (void) 
 {
+	if (disable_all_usb)
+		return -ENODEV;
 	pr_debug ("%s: block sizes: qh %Zd qtd %Zd itd %Zd sitd %Zd\n",
 		hcd_name,
 		sizeof (struct ehci_qh), sizeof (struct ehci_qtd),
diff -urN linux-2.4.22.org/drivers/usb/host/uhci.c linux-2.4.22/drivers/usb/host/uhci.c
--- linux-2.4.22.org/drivers/usb/host/uhci.c	2003-11-21 19:50:57.000000000 +0100
+++ linux-2.4.22/drivers/usb/host/uhci.c	2003-11-21 19:59:22.000000000 +0100
@@ -3099,10 +3099,14 @@
 #endif	/* PM */
 };
 
+extern int disable_all_usb; 
  
 static int __init uhci_hcd_init(void)
 {
 	int retval = -ENOMEM;
+	
+	if (disable_all_usb)
+		return -ENODEV;
 
 	info(DRIVER_DESC " " DRIVER_VERSION);
 
diff -urN linux-2.4.22.org/drivers/usb/host/usb-ohci.c linux-2.4.22/drivers/usb/host/usb-ohci.c
--- linux-2.4.22.org/drivers/usb/host/usb-ohci.c	2003-11-21 19:50:57.000000000 +0100
+++ linux-2.4.22/drivers/usb/host/usb-ohci.c	2003-11-21 19:59:22.000000000 +0100
@@ -2939,9 +2939,12 @@
 
  
 /*-------------------------------------------------------------------------*/
+extern int disable_all_usb;
 
 static int __init ohci_hcd_init (void) 
 {
+	if (disable_all_usb)
+		return -ENODEV;
 	return pci_module_init (&ohci_pci_driver);
 }
 
diff -urN linux-2.4.22.org/drivers/usb/host/usb-uhci.c linux-2.4.22/drivers/usb/host/usb-uhci.c
--- linux-2.4.22.org/drivers/usb/host/usb-uhci.c	2003-11-21 19:50:57.000000000 +0100
+++ linux-2.4.22/drivers/usb/host/usb-uhci.c	2003-11-21 19:59:22.000000000 +0100
@@ -3092,10 +3092,14 @@
 };
 
 /*-------------------------------------------------------------------------*/
+extern int disable_all_usb;
 
 static int __init uhci_hcd_init (void) 
 {
 	int retval;
+	
+	if (disable_all_usb)
+		return -ENODEV;
 
 #ifdef DEBUG_SLAB
 	urb_priv_kmem = kmem_cache_create("urb_priv", sizeof(urb_priv_t), 0, SLAB_HWCACHE_ALIGN, NULL, NULL);
diff -urN linux-2.4.22.org/init/main.c linux-2.4.22/init/main.c
--- linux-2.4.22.org/init/main.c	2003-11-21 19:45:09.000000000 +0100
+++ linux-2.4.22/init/main.c	2003-11-21 19:59:22.000000000 +0100
@@ -138,6 +138,15 @@
 
 __setup("profile=", profile_setup);
 
+int disable_all_usb = 0;
+static int __init no_usb(char * s)
+{
+	disable_all_usb = 1;
+	return 1;
+}
+__setup("nousb", no_usb);
+
+
 static int __init checksetup(char *line)
 {
 	struct kernel_param *p;
diff -urN linux-2.4.22.org/kernel/ksyms.c linux-2.4.22/kernel/ksyms.c
--- linux-2.4.22.org/kernel/ksyms.c	2003-11-21 19:45:09.000000000 +0100
+++ linux-2.4.22/kernel/ksyms.c	2003-11-21 20:00:08.000000000 +0100
@@ -530,6 +530,8 @@
 EXPORT_SYMBOL(seq_release);
 EXPORT_SYMBOL(seq_read);
 EXPORT_SYMBOL(seq_lseek);
+extern int disable_all_usb;
+EXPORT_SYMBOL(disable_all_usb);
 EXPORT_SYMBOL(single_open);
 EXPORT_SYMBOL(single_release);
 EXPORT_SYMBOL(seq_release_private);
Commit	Line	Data
4baf508f AM	1	diff -urN linux-2.4.22.org/drivers/usb/host/ehci-hcd.c linux-2.4.22/drivers/usb/host/ehci-hcd.c
	2	--- linux-2.4.22.org/drivers/usb/host/ehci-hcd.c 2003-11-21 19:50:57.000000000 +0100
	3	+++ linux-2.4.22/drivers/usb/host/ehci-hcd.c 2003-11-21 19:59:22.000000000 +0100
	4	@@ -1041,8 +1041,11 @@
1046336c JR	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;
a3854b07 JR	13	pr_debug ("%s: block sizes: qh %Zd qtd %Zd itd %Zd sitd %Zd\n",
a3854b07 JR	14	hcd_name,
1046336c	15	sizeof (struct ehci_qh), sizeof (struct ehci_qtd),
4baf508f AM	16	diff -urN linux-2.4.22.org/drivers/usb/host/uhci.c linux-2.4.22/drivers/usb/host/uhci.c
	17	--- linux-2.4.22.org/drivers/usb/host/uhci.c 2003-11-21 19:50:57.000000000 +0100
	18	+++ linux-2.4.22/drivers/usb/host/uhci.c 2003-11-21 19:59:22.000000000 +0100
	19	@@ -3099,10 +3099,14 @@
1046336c JR	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
4baf508f AM	34	diff -urN linux-2.4.22.org/drivers/usb/host/usb-ohci.c linux-2.4.22/drivers/usb/host/usb-ohci.c
	35	--- linux-2.4.22.org/drivers/usb/host/usb-ohci.c 2003-11-21 19:50:57.000000000 +0100
	36	+++ linux-2.4.22/drivers/usb/host/usb-ohci.c 2003-11-21 19:59:22.000000000 +0100
	37	@@ -2939,9 +2939,12 @@
1046336c JR	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
4baf508f AM	50	diff -urN linux-2.4.22.org/drivers/usb/host/usb-uhci.c linux-2.4.22/drivers/usb/host/usb-uhci.c
	51	--- linux-2.4.22.org/drivers/usb/host/usb-uhci.c 2003-11-21 19:50:57.000000000 +0100
	52	+++ linux-2.4.22/drivers/usb/host/usb-uhci.c 2003-11-21 19:59:22.000000000 +0100
	53	@@ -3092,10 +3092,14 @@
1046336c JR	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);
4baf508f AM	68	diff -urN linux-2.4.22.org/init/main.c linux-2.4.22/init/main.c
	69	--- linux-2.4.22.org/init/main.c 2003-11-21 19:45:09.000000000 +0100
	70	+++ linux-2.4.22/init/main.c 2003-11-21 19:59:22.000000000 +0100
	71	@@ -138,6 +138,15 @@
1046336c JR	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;
4baf508f AM	87	diff -urN linux-2.4.22.org/kernel/ksyms.c linux-2.4.22/kernel/ksyms.c
	88	--- linux-2.4.22.org/kernel/ksyms.c 2003-11-21 19:45:09.000000000 +0100
	89	+++ linux-2.4.22/kernel/ksyms.c 2003-11-21 20:00:08.000000000 +0100
	90	@@ -530,6 +530,8 @@
1046336c JR	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);
4baf508f AM	96	EXPORT_SYMBOL(single_open);
	97	EXPORT_SYMBOL(single_release);
	98	EXPORT_SYMBOL(seq_release_private);
636fa50b	99