SOURCES (LINUX_2_6_14): linux-2.6.14.7-kernel-hotfixes.patch (NEW)...
mguevara
mguevara at pld-linux.org
Tue Feb 21 19:10:28 CET 2006
Author: mguevara Date: Tue Feb 21 18:10:28 2006 GMT
Module: SOURCES Tag: LINUX_2_6_14
---- Log message:
- 2.6.14.7 replacement for kernel-hotfixes.patch
- updated megaraid kconfig
- removed alpha spinlock stuff (imho not needed now because we have
definition of _raw_read_trylock (which points to __raw_read_trylock)
in include/linux/spinlock.h
---- Files affected:
SOURCES:
linux-2.6.14.7-kernel-hotfixes.patch (NONE -> 1.1.2.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6.14.7-kernel-hotfixes.patch
diff -u /dev/null SOURCES/linux-2.6.14.7-kernel-hotfixes.patch:1.1.2.1
--- /dev/null Tue Feb 21 19:10:28 2006
+++ SOURCES/linux-2.6.14.7-kernel-hotfixes.patch Tue Feb 21 19:10:23 2006
@@ -0,0 +1,150 @@
+
+
+--- a/include/linux/spinlock.h 2004-09-05 02:05:53.243858818 -0500
++++ b/include/linux/spinlock.h 2004-09-05 02:06:06.177805993 -0500
+@@ -38,7 +38,7 @@
+ #ifdef CONFIG_SMP
+ #include <asm/spinlock.h>
+
+-#define __lockfunc fastcall __attribute__((section(".spinlock.text")))
++#define __lockfunc fastcall __attribute__((section(".lock.text")))
+
+ int __lockfunc _spin_trylock(spinlock_t *lock);
+ int __lockfunc _write_trylock(rwlock_t *lock);
+--- a/arch/i386/mm/init.c 2004-09-26 03:43:57.944613000 +1000
++++ b/arch/i386/mm/init.c 2004-09-28 02:37:21.787922000 +1000
+@@ -41,6 +41,7 @@
+ #include <asm/sections.h>
+
+ unsigned int __VMALLOC_RESERVE = 128 << 20;
++EXPORT_SYMBOL(__VMALLOC_RESERVE);
+
+ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
+ unsigned long highstart_pfn, highend_pfn;
+--- a/drivers/scsi/megaraid/Kconfig.megaraid 2004-12-24 22:34:01.000000000 +0100
++++ b/drivers/scsi/megaraid/Kconfig.megaraid 2005-01-30 12:48:22.248759048 +0100
+@@ -63,7 +63,6 @@
+ To compile this driver as a module, choose M here: the
+ module will be called megaraid_mbox
+
+-if MEGARAID_NEWGEN=n
+ config MEGARAID_LEGACY
+ tristate "LSI Logic Legacy MegaRAID Driver"
+ depends on PCI && SCSI
+--- a/arch/ppc/kernel/setup.c 2004-12-24 22:35:28.000000000 +0100
++++ b/arch/ppc/kernel/setup.c 2005-02-02 10:09:21.763162752 +0100
+@@ -84,6 +84,7 @@
+
+ #ifdef CONFIG_VGA_CONSOLE
+ unsigned long vgacon_remap_base;
++EXPORT_SYMBOL(vgacon_remap_base);
+ #endif
+
+ struct machdep_calls ppc_md;
+--- a/drivers/usb/gadget/serial.c 2004-12-24 22:35:24.000000000 +0100
++++ b/drivers/usb/gadget/serial.c 2005-02-15 09:39:48.408315792 +0100
+@@ -329,10 +329,6 @@
+
+ /* Functions */
+
+-/* module */
+-static int __init gs_module_init(void);
+-static void __exit gs_module_exit(void);
+-
+ /* tty driver */
+ static int gs_open(struct tty_struct *tty, struct file *file);
+ static void gs_close(struct tty_struct *tty, struct file *file);
+@@ -712,8 +708,6 @@
+ module_param(use_acm, uint, S_IRUGO);
+ MODULE_PARM_DESC(use_acm, "Use CDC ACM, 0=no, 1=yes, default=no");
+
+-module_init(gs_module_init);
+-module_exit(gs_module_exit);
+
+ /*
+ * gs_module_init
+@@ -761,6 +755,7 @@
+ printk(KERN_INFO "gs_module_init: %s %s loaded\n", GS_LONG_NAME, GS_VERSION_STR);
+ return 0;
+ }
++module_init(gs_module_init);
+
+ /*
+ * gs_module_exit
+@@ -775,6 +770,7 @@
+
+ printk(KERN_INFO "gs_module_exit: %s %s unloaded\n", GS_LONG_NAME, GS_VERSION_STR);
+ }
++module_exit(gs_module_exit);
+
+ /* TTY Driver */
+
+--- a/drivers/char/rocket.c 2004-12-24 22:35:21.000000000 +0100
++++ b/drivers/char/rocket.c 2005-02-15 09:48:39.050645896 +0100
+@@ -210,11 +210,6 @@
+ module_param_array(pc104_4, ulong, NULL, 0);
+ MODULE_PARM_DESC(pc104_4, "set interface types for ISA(PC104) board #4 (e.g. pc104_4=232,232,485,485,...");
+
+-int rp_init(void);
+-static void rp_cleanup_module(void);
+-
+-module_init(rp_init);
+-module_exit(rp_cleanup_module);
+
+ #endif
+
+@@ -2422,10 +2417,11 @@
+
+ return 0;
+ }
++module_init(rp_init);
+
+ #ifdef MODULE
+
+-static void rp_cleanup_module(void)
++static void __exit rp_cleanup_module(void)
+ {
+ int retval;
+ int i;
+@@ -2451,6 +2447,8 @@
+ if (controller)
+ release_region(controller, 4);
+ }
++module_exit(rp_cleanup_module);
++
+ #endif
+
+ #ifndef TRUE
+--- a/arch/alpha/kernel/alpha_ksyms.c 2005-03-13 07:44:05.000000000 +0100
++++ b/arch/alpha/kernel/alpha_ksyms.c 2005-03-15 23:20:00.405832368 +0100
+@@ -67,6 +67,9 @@
+ EXPORT_SYMBOL(alpha_using_srm);
+ #endif /* CONFIG_ALPHA_GENERIC */
+
++#include <linux/pm.h>
++EXPORT_SYMBOL(pm_power_off);
++
+ /* platform dependent support */
+ EXPORT_SYMBOL(strcat);
+ EXPORT_SYMBOL(strcmp);
+--- a/arch/alpha/kernel/process.c 2005-03-13 07:44:40.000000000 +0100
++++ b/arch/alpha/kernel/process.c 2005-03-15 23:28:15.687538104 +0100
+@@ -183,6 +183,8 @@
+
+ EXPORT_SYMBOL(machine_power_off);
+
++void (*pm_power_off)(void) = machine_power_off;
++
+ /* Used by sysrq-p, among others. I don't believe r9-r15 are ever
+ saved in the context it's used. */
+
+--- a/drivers/scsi/megaraid/Kconfig.megaraid 2006-02-21 18:43:20.000000000 +0100
++++ b/drivers/scsi/megaraid/Kconfig.megaraid 2006-02-21 18:46:33.000000000 +0100
+@@ -74,7 +74,6 @@
+
+ To compile this driver as a module, choose M here: the
+ module will be called megaraid
+-endif
+
+ config MEGARAID_SAS
+ tristate "LSI Logic MegaRAID SAS RAID Module"
================================================================
More information about the pld-cvs-commit
mailing list