Author: glen Date: Sat May 8 21:39:00 2010 GMT Module: packages Tag: LINUX_2_6_27 ---- Log message: - fix symbol conflict on sparc
---- Files affected: packages/kernel: kernel-small_fixes.patch (1.1.2.15.2.8 -> 1.1.2.15.2.9) ---- Diffs: ================================================================ Index: packages/kernel/kernel-small_fixes.patch diff -u packages/kernel/kernel-small_fixes.patch:1.1.2.15.2.8 packages/kernel/kernel-small_fixes.patch:1.1.2.15.2.9 --- packages/kernel/kernel-small_fixes.patch:1.1.2.15.2.8 Thu Sep 10 12:53:21 2009 +++ packages/kernel/kernel-small_fixes.patch Sat May 8 23:38:55 2010 @@ -1,4 +1,3 @@ -diff -Nur linux-2.6.15.6/drivers/input/joystick/iforce/iforce-serio.c linux-2.6.15.6.iforce/drivers/input/joystick/iforce/iforce-serio.c --- linux-2.6.15.6/drivers/input/joystick/iforce/iforce-serio.c 2006-03-05 19:07:54.000000000 +0000 +++ linux-2.6.15.6.iforce/drivers/input/joystick/iforce/iforce-serio.c 2006-04-29 23:17:59.000000000 +0000 @@ -175,6 +175,12 @@ @@ -157,7 +156,6 @@ Signed-off-by: Hannes Reinecke <[email protected]> -diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c index e356b43..a3660a6 100644 --- a/drivers/scsi/device_handler/scsi_dh_alua.c +++ b/drivers/scsi/device_handler/scsi_dh_alua.c @@ -355,7 +353,6 @@ Reviewed-by: Eric Sandeen <[email protected]> Signed-off-by: Felix Blyakher <[email protected]> -diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index 504d540..ceeba45 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c @@ -383,7 +380,6 @@ } ASSERT(item->ri_total > item->ri_cnt); /* Description region is ri_buf[0] */ -=================================================================== --- a/kernel/cgroup.c 2008-12-11 04:41:51.000000000 +0530 +++ b/kernel/cgroup.c 2008-12-18 21:55:58.000000000 +0530 @@ -2934,9 +2934,6 @@ @@ -405,3 +401,16 @@ Acked-by: Serge E. Hallyn <se...@xxxxxxxxxx> ----------------- +--- kernel-2.6.27.46/arch/sparc/mm/init.c~ 2010-05-08 23:56:23.015019695 +0000 ++++ kernel-2.6.27.46/arch/sparc/mm/init.c 2010-05-08 23:55:50.187439000 +0000 +@@ -312,8 +312,10 @@ + pgprot_t PAGE_SHARED __read_mostly; + EXPORT_SYMBOL(PAGE_SHARED); + ++#ifdef CONFIG_PAX_PAGEEXEC + pgprot_t PAGE_SHARED_NOEXEC __read_mostly; + EXPORT_SYMBOL(PAGE_SHARED_NOEXEC); ++#endif + + void __init paging_init(void) + { ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-small_fixes.patch?r1=1.1.2.15.2.8&r2=1.1.2.15.2.9&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
