[kernel] r12410 - in dists/etch/linux-2.6/debian: . patches/features/all/xen patches/series

[Bastian Blank]

Author: waldi
Date: Sun Nov 23 11:50:24 2008
New Revision: 12410

Log:
[xen/i386] Fix pseudo hwcap value to match newer kernels.

* debian/changelog: Update.
* debian/patches/features/all/xen/fix-hwcap.patch: Add.
* debian/patches/series/24-extra: Add new patch.


Added:
   dists/etch/linux-2.6/debian/patches/features/all/xen/fix-hwcap.patch
Modified:
   dists/etch/linux-2.6/debian/changelog
   dists/etch/linux-2.6/debian/patches/series/24-extra

Modified: dists/etch/linux-2.6/debian/changelog
==============================================================================
--- dists/etch/linux-2.6/debian/changelog	(original)
+++ dists/etch/linux-2.6/debian/changelog	Sun Nov 23 11:50:24 2008
@@ -11,7 +11,9 @@
     (closes: #506418)
 
   [ Bastian Blank ]
-  * [xen] Remove 4gb segments warning completely. (closes: 506420)
+  * [xen] Remove 4gb segments warning completely. (closes: #391373)
+  * [xen/i386] Fix pseudo hwcap value to match newer kernels.
+    (closes: #506420)
 
  -- dann frazier <dannf at debian.org>  Fri, 17 Oct 2008 14:54:31 -0600
 

Added: dists/etch/linux-2.6/debian/patches/features/all/xen/fix-hwcap.patch
==============================================================================
--- (empty file)
+++ dists/etch/linux-2.6/debian/patches/features/all/xen/fix-hwcap.patch	Sun Nov 23 11:50:24 2008
@@ -0,0 +1,23 @@
+diff -r 832aac894efd arch/i386/kernel/vsyscall-note-xen.S
+--- a/arch/i386/kernel/vsyscall-note-xen.S	Wed Nov 19 13:15:46 2008 +0000
++++ b/arch/i386/kernel/vsyscall-note-xen.S	Sun Nov 23 11:30:37 2008 +0100
+@@ -17,7 +17,7 @@
+  * like /lib/i686/tls/nosegneg.  Note that an /etc/ld.so.conf.d/file
+  * corresponding to the bits here is needed to make ldconfig work right.
+  * It should contain:
+- *	hwcap 0 nosegneg
++ *	hwcap 1 nosegneg
+  * to match the mapping of bit to name that we give here.
+  */
+ #define NOTE_KERNELCAP_BEGIN(ncaps, mask) \
+@@ -26,7 +26,8 @@
+ #define NOTE_KERNELCAP(bit, name) \
+ 	.byte bit; .asciz name
+ #define NOTE_KERNELCAP_END ASM_ELF_NOTE_END
++#define VDSO_NOTE_NONEGSEG_BIT 1
+ 
+-NOTE_KERNELCAP_BEGIN(1, 1)
+-NOTE_KERNELCAP(1, "nosegneg")  /* Change 1 back to 0 when glibc is fixed! */
++NOTE_KERNELCAP_BEGIN(1, 1 << VDSO_NOTE_NONEGSEG_BIT)
++NOTE_KERNELCAP(VDSO_NOTE_NONEGSEG_BIT, "nosegneg")
+ NOTE_KERNELCAP_END

Modified: dists/etch/linux-2.6/debian/patches/series/24-extra
==============================================================================
--- dists/etch/linux-2.6/debian/patches/series/24-extra	(original)
+++ dists/etch/linux-2.6/debian/patches/series/24-extra	Sun Nov 23 11:50:24 2008
@@ -1,2 +1,3 @@
 + features/all/xen/softlockup-no-idle-hz.patch *_xen *_xen-vserver
 + features/all/xen/remove-4gb-warning.patch *_xen *_xen-vserver
++ features/all/xen/fix-hwcap.patch *_xen *_xen-vserver