From 1c6ef584428a11dba3327f137117bc2cef504082 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Fri, 15 May 2009 22:12:47 +0000 Subject: [PATCH] * debian/changelog: Update. * debian/config/defines: Ignore remaining ABI changes. * debian/patches/bugfix/all/stable/2.6.29.3-abi-1.patch: Add. * debian/patches/series/5: Add new patch. svn path=/dists/sid/linux-2.6/; revision=13618 --- debian/changelog | 1 + debian/config/defines | 2 ++ .../bugfix/all/stable/2.6.29.3-abi-1.patch | 21 +++++++++++++++++++ debian/patches/series/5 | 1 + 4 files changed, 25 insertions(+) create mode 100644 debian/patches/bugfix/all/stable/2.6.29.3-abi-1.patch diff --git a/debian/changelog b/debian/changelog index 590559cbf..658a35cbd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -71,6 +71,7 @@ linux-2.6 (2.6.29-5) UNRELEASED; urgency=low - mac80211: Fix bug in getting rx status for frames pending in reorder buffer - forcedeth: Fix resume from hibernation regression. + * Ignore ABI change. -- dann frazier Mon, 04 May 2009 13:40:51 -0600 diff --git a/debian/config/defines b/debian/config/defines index e0f330981..d5e60dcb7 100644 --- a/debian/config/defines +++ b/debian/config/defines @@ -1,5 +1,7 @@ [abi] abiname: 2 +ignore-changes: + copy_fs_struct exit_fs [base] arches: diff --git a/debian/patches/bugfix/all/stable/2.6.29.3-abi-1.patch b/debian/patches/bugfix/all/stable/2.6.29.3-abi-1.patch new file mode 100644 index 000000000..dbe99e6bc --- /dev/null +++ b/debian/patches/bugfix/all/stable/2.6.29.3-abi-1.patch @@ -0,0 +1,21 @@ +diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h +index 78a05bf..818ff7e 100644 +--- a/include/linux/fs_struct.h ++++ b/include/linux/fs_struct.h +@@ -4,11 +4,14 @@ + #include + + struct fs_struct { +- int users; ++ atomic_t count; + rwlock_t lock; + int umask; +- int in_exec; + struct path root, pwd; ++#ifndef __GENKSYMS__ ++ int users; ++ int in_exec; ++#endif + }; + + extern struct kmem_cache *fs_cachep; diff --git a/debian/patches/series/5 b/debian/patches/series/5 index a7630dcb5..afbcfe9db 100644 --- a/debian/patches/series/5 +++ b/debian/patches/series/5 @@ -5,3 +5,4 @@ + bugfix/all/mvsdio-platform.patch - bugfix/all/drm-intel.git-f544847fbaf099278343f875987a983f2b913134.patch + bugfix/all/stable/2.6.29.3.patch ++ bugfix/all/stable/2.6.29.3-abi-1.patch