Deal with ABI changes in 3.8.12

Ignore changes in jbd2 and snd-emu10k1, which shouldn't be used by OOT
modules.

Revert change to cgroup structure.

[x86] zsmalloc: Change to built-in, as it can no longer be modular

svn path=/dists/sid/linux/; revision=20070
This commit is contained in:
Ben Hutchings 2013-05-10 03:46:24 +00:00
parent d4d55c0739
commit 2addf6e0da
4 changed files with 17 additions and 1 deletions

View File

@ -1,5 +1,8 @@
[abi]
abiname: 1
ignore-changes:
module:fs/jbd2/jbd2
module:sound/pci/emu10k1/snd-emu10k1
[base]
arches:

View File

@ -1413,7 +1413,7 @@ CONFIG_ZRAM=m
##
## file: drivers/staging/zsmalloc/Kconfig
##
CONFIG_ZSMALLOC=m
CONFIG_ZSMALLOC=y
##
## file: drivers/thermal/Kconfig

View File

@ -0,0 +1,12 @@
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -303,6 +303,9 @@ struct cftype {
/* CFTYPE_* flags */
unsigned int flags;
+ /* unused; for ABI compatibility only */
+ struct simple_xattrs xattrs;
+
int (*open)(struct inode *inode, struct file *file);
ssize_t (*read)(struct cgroup *cgrp, struct cftype *cft,
struct file *file,

View File

@ -80,3 +80,4 @@ bugfix/all/efivars-explicitly-calculate-length-of-VariableName.patch
bugfix/all/efivars-Handle-duplicate-names-from-get_next_variabl.patch
debian/efivars-remove-check-for-50-full-on-write.patch
debian/cdc_ncm-cdc_mbim-use-ncm-by-default.patch
debian/cgroup-avoid-ABI-change-in-3.8.12.patch