[kernel] r19636 - in dists/squeeze/linux-2.6/debian/patches: debian features/all/openvz series

[Ben Hutchings]

Author: benh
Date: Sun Dec 23 20:08:03 2012
New Revision: 19636

Log:
Fix up ABI changes in 2.6.32.60

Added:
   dists/squeeze/linux-2.6/debian/patches/debian/epoll-Avoid-ABI-change-in-file.patch
   dists/squeeze/linux-2.6/debian/patches/debian/random-Avoid-ABI-change-in-irq_desc.patch
Modified:
   dists/squeeze/linux-2.6/debian/patches/features/all/openvz/openvz.patch
   dists/squeeze/linux-2.6/debian/patches/series/47

Added: dists/squeeze/linux-2.6/debian/patches/debian/epoll-Avoid-ABI-change-in-file.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/debian/epoll-Avoid-ABI-change-in-file.patch	Sun Dec 23 20:08:03 2012	(r19636)
@@ -0,0 +1,31 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: epoll: Avoid ABI change in struct file
+Date: Sun, 23 Dec 2012 19:05:04 +0000
+
+commit 28d82dc1c4ed ('epoll: limit paths') added the member
+f_tfile_llink to the middle of struct file and was backported in Linux
+2.6.32.60.  This structure is always allocated in filp_open(), with a
+few exceptions that are not exposed to userland (so not used with
+epoll), so we can add this member at the end.  Move it there and hide
+it from genksyms.
+
+--- a/include/linux/fs.h
++++ b/include/linux/fs.h
+@@ -940,12 +940,16 @@ struct file {
+ #ifdef CONFIG_EPOLL
+ 	/* Used by fs/eventpoll.c to link all the hooks to this file */
+ 	struct list_head	f_ep_links;
+-	struct list_head	f_tfile_llink;
+ #endif /* #ifdef CONFIG_EPOLL */
+ 	struct address_space	*f_mapping;
+ #ifdef CONFIG_DEBUG_WRITECOUNT
+ 	unsigned long f_mnt_write_state;
+ #endif
++#ifndef __GENKSYMS__
++#ifdef CONFIG_EPOLL
++	struct list_head	f_tfile_llink;
++#endif
++#endif
+ };
+ extern spinlock_t files_lock;
+ #define file_list_lock() spin_lock(&files_lock);

Added: dists/squeeze/linux-2.6/debian/patches/debian/random-Avoid-ABI-change-in-irq_desc.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/debian/random-Avoid-ABI-change-in-irq_desc.patch	Sun Dec 23 20:08:03 2012	(r19636)
@@ -0,0 +1,18 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: random: Avoid ABI change in irq_desc
+Date: Sun, 23 Dec 2012 18:51:34 +0000
+
+commit c5857ccf2939 ('random: remove rand_initialize_irq()') removed
+irq_desc::timer_rand_state and was backported in Linux 2.6.32.60.
+We need to put it back to maintain the structure layout.
+
+--- a/include/linux/irq.h
++++ b/include/linux/irq.h
+@@ -174,6 +174,7 @@ struct irq_2_iommu;
+  */
+ struct irq_desc {
+ 	unsigned int		irq;
++	struct timer_rand_state	*timer_rand_state; /* now unused */
+ 	unsigned int            *kstat_irqs;
+ #ifdef CONFIG_INTR_REMAP
+ 	struct irq_2_iommu      *irq_2_iommu;

Modified: dists/squeeze/linux-2.6/debian/patches/features/all/openvz/openvz.patch
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Sun Dec 23 12:07:17 2012	(r19635)
+++ dists/squeeze/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Sun Dec 23 20:08:03 2012	(r19636)
@@ -6546,6 +6546,7 @@
 [bwh: Fix context for changes to fs/signalfd.c, include/linux/signalfd.h
  and kernel/fork.c following addition of signalfd_cleanup() in 2.6.32.60]
 [bwh: Fix content for changes to do_tcp_sendpages() after 2.6.32.60]
+[bwh: Fix context for changes to struct file after 2.6.32.60]
 
 diff --git a/COPYING.Parallels b/COPYING.Parallels
 new file mode 100644
@@ -33486,9 +33487,9 @@
  	unsigned long f_mnt_write_state;
  #endif
 +	struct ve_struct	*owner_env;
- };
- extern spinlock_t files_lock;
- #define file_list_lock() spin_lock(&files_lock);
+ #ifndef __GENKSYMS__
+ #ifdef CONFIG_EPOLL
+ 	struct list_head	f_tfile_llink;
 @@ -1063,6 +1083,9 @@ struct file_lock {
  	fl_owner_t fl_owner;
  	unsigned char fl_flags;

Modified: dists/squeeze/linux-2.6/debian/patches/series/47
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/47	Sun Dec 23 12:07:17 2012	(r19635)
+++ dists/squeeze/linux-2.6/debian/patches/series/47	Sun Dec 23 20:08:03 2012	(r19636)
@@ -168,3 +168,5 @@
 + bugfix/all/hugetlb-fix-resv_map-leak-in-error-path.patch
 + bugfix/all/mm-fix-vma_resv_map-NULL-pointer.patch
 + bugfix/x86/x86-Don-t-use-the-EFI-reboot-method-by-default.patch
++ debian/random-Avoid-ABI-change-in-irq_desc.patch
++ debian/epoll-Avoid-ABI-change-in-file.patch