[kernel] r12407 - in people/waldi/xen-extra/linux-2.6.18-xen-3.3/debian: . patches-update/features/all/xen patches-update/series

[Bastian Blank]

Author: waldi
Date: Sun Nov 23 10:35:00 2008
New Revision: 12407

Log:
Fix pseudo hwcap to match current kernels.

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


Added:
   people/waldi/xen-extra/linux-2.6.18-xen-3.3/debian/patches-update/features/all/xen/fix-hwcap.patch
Modified:
   people/waldi/xen-extra/linux-2.6.18-xen-3.3/debian/changelog
   people/waldi/xen-extra/linux-2.6.18-xen-3.3/debian/patches-update/series/1-extra

Modified: people/waldi/xen-extra/linux-2.6.18-xen-3.3/debian/changelog
==============================================================================
--- people/waldi/xen-extra/linux-2.6.18-xen-3.3/debian/changelog	(original)
+++ people/waldi/xen-extra/linux-2.6.18-xen-3.3/debian/changelog	Sun Nov 23 10:35:00 2008
@@ -1,3 +1,9 @@
+linux-2.6.18-xen-3.3 (2.6.18.dfsg.1-23+xen.2) UNRELEASED; urgency=low
+
+  * Fix pseudo hwcap value to fix newer kernels.
+
+ -- Bastian Blank <waldi at debian.org>  Sun, 23 Nov 2008 11:31:46 +0100
+
 linux-2.6.18-xen-3.3 (2.6.18.dfsg.1-23+xen.1) kernel-waldi-xen-extra; urgency=low
 
   * Update Xen patch to revision 748f324a4b2d62d89fe40c4aa52861977e1a2cae of

Added: people/waldi/xen-extra/linux-2.6.18-xen-3.3/debian/patches-update/features/all/xen/fix-hwcap.patch
==============================================================================
--- (empty file)
+++ people/waldi/xen-extra/linux-2.6.18-xen-3.3/debian/patches-update/features/all/xen/fix-hwcap.patch	Sun Nov 23 10:35:00 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(0, "nosegneg")
++NOTE_KERNELCAP_BEGIN(1, 1 << VDSO_NOTE_NONEGSEG_BIT)
++NOTE_KERNELCAP(VDSO_NOTE_NONEGSEG_BIT, "nosegneg")
+ NOTE_KERNELCAP_END

Modified: people/waldi/xen-extra/linux-2.6.18-xen-3.3/debian/patches-update/series/1-extra
==============================================================================
--- people/waldi/xen-extra/linux-2.6.18-xen-3.3/debian/patches-update/series/1-extra	(original)
+++ people/waldi/xen-extra/linux-2.6.18-xen-3.3/debian/patches-update/series/1-extra	Sun Nov 23 10:35:00 2008
@@ -7,4 +7,5 @@
 + features/all/xen/xen-748f324a4b2d62d89fe40c4aa52861977e1a2cae.patch
 + features/all/xen/remove-4gb-warning.patch arch=i386
 + features/all/xen/console-hvc-overtake.patch
++ features/all/xen/fix-hwcap.patch
 + features/all/xen/vserver-update.patch featureset=xen-vserver