r1845 - in linux-kernel-headers/trunk/debian: . patches
Author: schizo
Date: 2006-10-08 08:59:19 +0000 (Sun, 08 Oct 2006)
New Revision: 1845
Added:
linux-kernel-headers/trunk/debian/patches/linux-ext2_fs.patch
linux-kernel-headers/trunk/debian/patches/linux-ixjuser.patch
Modified:
linux-kernel-headers/trunk/debian/changelog
linux-kernel-headers/trunk/debian/patches/series
Log:
* Add linux-ext2_fs.patch. closes: #301641.
* Add linux-ixjuser.patch. closes: #321246.
Modified: linux-kernel-headers/trunk/debian/changelog
===================================================================
--- linux-kernel-headers/trunk/debian/changelog 2006-10-08 06:59:11 UTC (rev 1844)
+++ linux-kernel-headers/trunk/debian/changelog 2006-10-08 08:59:19 UTC (rev 1845)
@@ -1,3 +1,10 @@
+linux-kernel-headers (2.6.18-3) unstable; urgency=medium
+
+ * Add linux-ext2_fs.patch. closes: #301641.
+ * Add linux-ixjuser.patch. closes: #321246.
+
+ -- Clint Adams <schizo@debian.org> Sun, 8 Oct 2006 04:40:20 -0400
+
linux-kernel-headers (2.6.18-2) unstable; urgency=high
* Update byteorder-const.patch with patch from Wookey,
Added: linux-kernel-headers/trunk/debian/patches/linux-ext2_fs.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/linux-ext2_fs.patch (rev 0)
+++ linux-kernel-headers/trunk/debian/patches/linux-ext2_fs.patch 2006-10-08 08:59:19 UTC (rev 1845)
@@ -0,0 +1,30 @@
+Index: linux-kernel-headers-2.6.18/include/linux/ext2_fs_sb.h
+===================================================================
+--- linux-kernel-headers-2.6.18.orig/include/linux/ext2_fs_sb.h 2006-10-08 04:43:16.591773656 -0400
++++ linux-kernel-headers-2.6.18/include/linux/ext2_fs_sb.h 2006-10-08 04:43:25.848720665 -0400
+@@ -46,9 +46,9 @@
+ int s_inode_size;
+ int s_first_ino;
+ spinlock_t s_next_gen_lock;
+- u32 s_next_generation;
++ __s32 s_next_generation;
+ unsigned long s_dir_count;
+- u8 *s_debts;
++ __s8 *s_debts;
+ struct percpu_counter s_freeblocks_counter;
+ struct percpu_counter s_freeinodes_counter;
+ struct percpu_counter s_dirs_counter;
+Index: linux-kernel-headers-2.6.18/include/linux/percpu_counter.h
+===================================================================
+--- linux-kernel-headers-2.6.18.orig/include/linux/percpu_counter.h 2006-10-08 04:42:11.733138516 -0400
++++ linux-kernel-headers-2.6.18/include/linux/percpu_counter.h 2006-10-08 04:43:07.802874532 -0400
+@@ -9,7 +9,9 @@
+ #include <linux/spinlock.h>
+ #include <linux/smp.h>
+ #include <linux/threads.h>
++#ifdef __KERNEL__
+ #include <linux/percpu.h>
++#endif
+ #include <linux/types.h>
+
+ #ifdef CONFIG_SMP
Added: linux-kernel-headers/trunk/debian/patches/linux-ixjuser.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/linux-ixjuser.patch (rev 0)
+++ linux-kernel-headers/trunk/debian/patches/linux-ixjuser.patch 2006-10-08 08:59:19 UTC (rev 1845)
@@ -0,0 +1,13 @@
+Index: linux-kernel-headers-2.6.18/include/linux/ixjuser.h
+===================================================================
+--- linux-kernel-headers-2.6.18.orig/include/linux/ixjuser.h 2006-10-08 04:50:24.319533534 -0400
++++ linux-kernel-headers-2.6.18/include/linux/ixjuser.h 2006-10-08 04:50:34.920618164 -0400
+@@ -348,7 +348,7 @@
+ typedef struct {
+ int elements_used;
+ IXJ_CADENCE_TERM termination;
+- IXJ_CADENCE_ELEMENT __user *ce;
++ IXJ_CADENCE_ELEMENT *ce;
+ } IXJ_CADENCE;
+
+ #define IXJCTL_TONE_CADENCE _IOW ('q', 0xCA, IXJ_CADENCE *)
Modified: linux-kernel-headers/trunk/debian/patches/series
===================================================================
--- linux-kernel-headers/trunk/debian/patches/series 2006-10-08 06:59:11 UTC (rev 1844)
+++ linux-kernel-headers/trunk/debian/patches/series 2006-10-08 08:59:19 UTC (rev 1845)
@@ -34,3 +34,5 @@
linux-futex.patch
asm-generic-bitops-fls64.patch
asm-generic-div64.patch
+linux-ext2_fs.patch
+linux-ixjuser.patch
Reply to: