[linux] 03/04: Fix some ABI changes in 3.2.80

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch wheezy-security
in repository linux.

commit cdcba200adbecf61509c73083d74aec134767548
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun May 1 15:50:27 2016 +0200

    Fix some ABI changes in 3.2.80
---
 .../debian/fs-fix-abi-change-in-3.2.80.patch       | 60 ++++++++++++++++++++++
 .../debian/pci-fix-abi-change-in-3.2.80.patch      | 21 ++++++++
 debian/patches/series                              |  2 +
 3 files changed, 83 insertions(+)

diff --git a/debian/patches/debian/fs-fix-abi-change-in-3.2.80.patch b/debian/patches/debian/fs-fix-abi-change-in-3.2.80.patch
new file mode 100644
index 0000000..0883600
--- /dev/null
+++ b/debian/patches/debian/fs-fix-abi-change-in-3.2.80.patch
@@ -0,0 +1,60 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sun, 01 May 2016 15:39:07 +0200
+Subject: fs: Fix ABI change in 3.2.80
+Forwarded: not-needed
+
+file_open_root() gained an extra parameter to set the file mode.
+Restore the old function signature and define a separate function,
+file_open_root_umode(), that takes the extra parameter.
+
+---
+--- a/fs/open.c
++++ b/fs/open.c
+@@ -958,8 +958,8 @@ struct file *filp_open(const char *filen
+ }
+ EXPORT_SYMBOL(filp_open);
+ 
+-struct file *file_open_root(struct dentry *dentry, struct vfsmount *mnt,
+-			    const char *filename, int flags, umode_t mode)
++struct file *file_open_root_umode(struct dentry *dentry, struct vfsmount *mnt,
++				  const char *filename, int flags, umode_t mode)
+ {
+ 	struct open_flags op;
+ 	int lookup = build_open_flags(flags, mode, &op);
+@@ -968,7 +968,7 @@ struct file *file_open_root(struct dentr
+ 			return ERR_PTR(-ENOTDIR);
+ 	return do_file_open_root(dentry, mnt, filename, &op, lookup);
+ }
+-EXPORT_SYMBOL(file_open_root);
++EXPORT_SYMBOL(file_open_root_umode);
+ 
+ long do_sys_open(int dfd, const char __user *filename, int flags, int mode)
+ {
+@@ -1141,3 +1141,13 @@ int nonseekable_open(struct inode *inode
+ }
+ 
+ EXPORT_SYMBOL(nonseekable_open);
++
++#undef file_open_root
++struct file *file_open_root(struct dentry *dentry, struct vfsmount *mnt,
++			    const char *filename, int flags)
++{
++	if (flags & O_CREAT)
++		return ERR_PTR(-EINVAL);
++	return file_open_root_umode(dentry, mnt, filename, flags, 0);
++}
++EXPORT_SYMBOL(file_open_root);
+--- a/include/linux/fs.h
++++ b/include/linux/fs.h
+@@ -2075,7 +2075,10 @@ extern long do_sys_open(int dfd, const c
+ 			int mode);
+ extern struct file *filp_open(const char *, int, int);
+ extern struct file *file_open_root(struct dentry *, struct vfsmount *,
+-				   const char *, int, umode_t);
++				   const char *, int);
++extern struct file *file_open_root_umode(struct dentry *, struct vfsmount *,
++					 const char *, int, umode_t);
++#define file_open_root file_open_root_umode
+ extern struct file * dentry_open(struct dentry *, struct vfsmount *, int,
+ 				 const struct cred *);
+ extern int filp_close(struct file *, fl_owner_t id);
diff --git a/debian/patches/debian/pci-fix-abi-change-in-3.2.80.patch b/debian/patches/debian/pci-fix-abi-change-in-3.2.80.patch
new file mode 100644
index 0000000..37f1af5
--- /dev/null
+++ b/debian/patches/debian/pci-fix-abi-change-in-3.2.80.patch
@@ -0,0 +1,21 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sun, 01 May 2016 15:48:14 +0200
+Subject: PCI: Avoid ABI change in 3.2.80
+Forwarded: not-needed
+
+Move the added bitfield pci_dev::non_compliant_bars to the end of its
+bitfield group and hide it from genksyms.
+
+--- a/include/linux/pci.h
++++ b/include/linux/pci.h
+@@ -331,7 +331,10 @@ struct pci_dev {
+ 	unsigned int    is_hotplug_bridge:1;
+ 	unsigned int    __aer_firmware_first_valid:1;
+ 	unsigned int	__aer_firmware_first:1;
++#ifndef __GENKSYMS__
+ 	unsigned int	non_compliant_bars:1;	/* broken BARs; ignore them */
++	/* 9 bits spare */
++#endif
+ 	pci_dev_flags_t dev_flags;
+ 	atomic_t	enable_cnt;	/* pci_enable_device has been called */
+ 
diff --git a/debian/patches/series b/debian/patches/series
index cf467af..d413fa0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1169,3 +1169,5 @@ debian/hrtimer-fix-abi-change-in-3.2.78.patch
 debian/crypto-fix-abi-change-in-3.2.77.patch
 debian/revert-libata-align-ata_device-s-id-on-a-cacheline.patch
 debian/tracing-avoid-abi-change-in-3.2.79.patch
+debian/fs-fix-abi-change-in-3.2.80.patch
+debian/pci-fix-abi-change-in-3.2.80.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git