Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2011-07-25 12:42:29 +0200
committerMichal Marek <mmarek@suse.cz>2011-07-25 12:44:51 +0200
commitb5f5212a1290cd15095bf983c177f53fe93f3788 (patch)
tree67580680ce58ce26d31ad2a68e323f048a3667cd
parent657f6a3dae7a469e94151a4090f587fa28c9133b (diff)
Fix format of patches to apply with series2git:
patches.arch/s390-message-catalog.diff patches.drivers/input-Add-LED-support-to-Synaptics-device patches.fixes/kvm-macos.patch patches.fixes/mm-Fix-assertion-mapping-nrpages-0-in-end_writeback.patch patches.fixes/nfs-slot-table-alloc patches.fixes/oom-warning patches.fixes/scsi-dh-alua-send-stpg patches.suse/0001-vfs-Hooks-for-more-fine-grained-directory-permission.patch patches.suse/0002-vfs-Add-generic-IS_ACL-test-for-acl-support.patch patches.suse/0015-ext4-Use-IS_POSIXACL-to-check-for-POSIX-ACL-support.patch patches.suse/0016-ext4-Implement-richacl-support-in-ext4.patch patches.suse/dm-mpath-no-activate-for-offlined-paths patches.suse/dm-mpath-no-partitions-feature patches.suse/no-frame-pointer-select patches.suse/no-partition-scan patches.suse/revert-x86-remove-warning-and-warning_symbol-from-struct-stacktrace_ops patches.suse/setuid-dumpable-wrongdir patches.suse/stack-unwind patches.suse/supported-flag-enterprise
-rw-r--r--patches.arch/s390-message-catalog.diff2
-rw-r--r--patches.drivers/input-Add-LED-support-to-Synaptics-device4
-rw-r--r--patches.fixes/kvm-macos.patch2
-rw-r--r--patches.fixes/mm-Fix-assertion-mapping-nrpages-0-in-end_writeback.patch2
-rw-r--r--patches.fixes/nfs-slot-table-alloc2
-rw-r--r--patches.fixes/oom-warning4
-rw-r--r--patches.fixes/scsi-dh-alua-send-stpg4
-rw-r--r--patches.suse/0001-vfs-Hooks-for-more-fine-grained-directory-permission.patch2
-rw-r--r--patches.suse/0002-vfs-Add-generic-IS_ACL-test-for-acl-support.patch4
-rw-r--r--patches.suse/0015-ext4-Use-IS_POSIXACL-to-check-for-POSIX-ACL-support.patch6
-rw-r--r--patches.suse/0016-ext4-Implement-richacl-support-in-ext4.patch10
-rw-r--r--patches.suse/dm-mpath-no-activate-for-offlined-paths4
-rw-r--r--patches.suse/dm-mpath-no-partitions-feature6
-rw-r--r--patches.suse/no-frame-pointer-select8
-rw-r--r--patches.suse/no-partition-scan2
-rw-r--r--patches.suse/revert-x86-remove-warning-and-warning_symbol-from-struct-stacktrace_ops18
-rw-r--r--patches.suse/setuid-dumpable-wrongdir2
-rw-r--r--patches.suse/stack-unwind2
-rw-r--r--patches.suse/supported-flag-enterprise2
19 files changed, 43 insertions, 43 deletions
diff --git a/patches.arch/s390-message-catalog.diff b/patches.arch/s390-message-catalog.diff
index 52517c409e..072a7e68b4 100644
--- a/patches.arch/s390-message-catalog.diff
+++ b/patches.arch/s390-message-catalog.diff
@@ -7948,7 +7948,7 @@ Acked-by: John Jolly <jjolly@suse.de>
+
config SECCOMP
def_bool y
- prompt "Enable seccomp to safely compute untrusted bytecode"
+ prompt "Enable seccomp to safely compute untrusted bytecode"
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -643,6 +643,38 @@ extern const char *dev_driver_string(con
diff --git a/patches.drivers/input-Add-LED-support-to-Synaptics-device b/patches.drivers/input-Add-LED-support-to-Synaptics-device
index 3f624ec4ac..51439844b5 100644
--- a/patches.drivers/input-Add-LED-support-to-Synaptics-device
+++ b/patches.drivers/input-Add-LED-support-to-Synaptics-device
@@ -209,9 +209,9 @@ Signed-off-by: Takashi Iwai <tiwai@suse.de>
/* Data read from the touchpad */
unsigned long int model_id; /* Model-ID */
@@ -110,6 +112,7 @@ struct synaptics_data {
- struct serio *pt_port; /* Pass-through serio port */
+ struct serio *pt_port; /* Pass-through serio port */
- struct synaptics_hw_state mt; /* current gesture packet */
+ struct synaptics_hw_state mt; /* current gesture packet */
+ struct synaptics_led *led;
};
diff --git a/patches.fixes/kvm-macos.patch b/patches.fixes/kvm-macos.patch
index d6534af9d8..700f705393 100644
--- a/patches.fixes/kvm-macos.patch
+++ b/patches.fixes/kvm-macos.patch
@@ -41,7 +41,7 @@ References: bnc#556564
- [SVM_EXIT_MWAIT] = invalid_op_interception,
+ [SVM_EXIT_MONITOR] = monitor_interception,
+ [SVM_EXIT_MWAIT] = mwait_interception,
- [SVM_EXIT_XSETBV] = xsetbv_interception,
+ [SVM_EXIT_XSETBV] = xsetbv_interception,
[SVM_EXIT_NPF] = pf_interception,
};
--- a/arch/x86/kvm/x86.c
diff --git a/patches.fixes/mm-Fix-assertion-mapping-nrpages-0-in-end_writeback.patch b/patches.fixes/mm-Fix-assertion-mapping-nrpages-0-in-end_writeback.patch
index 530b748954..a9e65c7fa8 100644
--- a/patches.fixes/mm-Fix-assertion-mapping-nrpages-0-in-end_writeback.patch
+++ b/patches.fixes/mm-Fix-assertion-mapping-nrpages-0-in-end_writeback.patch
@@ -42,7 +42,7 @@ index a956675..ec3d292 100644
@@ -291,6 +291,13 @@ void truncate_inode_pages_range(struct address_space *mapping,
mem_cgroup_uncharge_end();
}
- cleancache_flush_inode(mapping);
+ cleancache_flush_inode(mapping);
+ /*
+ * Cycle the tree_lock to make sure all __delete_from_page_cache()
+ * calls run from page reclaim have finished as well (this handles the
diff --git a/patches.fixes/nfs-slot-table-alloc b/patches.fixes/nfs-slot-table-alloc
index c3297414cb..8426e06d9e 100644
--- a/patches.fixes/nfs-slot-table-alloc
+++ b/patches.fixes/nfs-slot-table-alloc
@@ -21,7 +21,7 @@ Signed-off-by: Neil Brown <neilb@suse.de>
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -2266,7 +2266,7 @@ static struct rpc_xprt *xs_setup_xprt(st
- atomic_set(&xprt->count, 1);
+ atomic_set(&xprt->count, 1);
xprt->max_reqs = max_req;
- xprt->slot = kcalloc(max_req, sizeof(struct rpc_rqst), GFP_KERNEL);
diff --git a/patches.fixes/oom-warning b/patches.fixes/oom-warning
index 410c4d3884..f173b66648 100644
--- a/patches.fixes/oom-warning
+++ b/patches.fixes/oom-warning
@@ -14,8 +14,8 @@ Signed-off-by: Andrea Arcangeli <andrea@suse.de>
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2087,7 +2087,13 @@ rebalance:
- va_end(args);
- }
+ va_end(args);
+ }
- pr_warning("%s: page allocation failure: order:%d, mode:0x%x\n",
+ if (!(gfp_mask & __GFP_WAIT)) {
diff --git a/patches.fixes/scsi-dh-alua-send-stpg b/patches.fixes/scsi-dh-alua-send-stpg
index 6b06d08fb1..610b225171 100644
--- a/patches.fixes/scsi-dh-alua-send-stpg
+++ b/patches.fixes/scsi-dh-alua-send-stpg
@@ -28,6 +28,6 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
- if (h->tpgs & TPGS_MODE_EXPLICIT &&
+ if ((h->tpgs & TPGS_MODE_EXPLICIT) &&
- h->state != TPGS_STATE_OPTIMIZED &&
- h->state != TPGS_STATE_LBA_DEPENDENT) {
+ h->state != TPGS_STATE_OPTIMIZED &&
+ h->state != TPGS_STATE_LBA_DEPENDENT) {
h->callback_fn = fn;
diff --git a/patches.suse/0001-vfs-Hooks-for-more-fine-grained-directory-permission.patch b/patches.suse/0001-vfs-Hooks-for-more-fine-grained-directory-permission.patch
index 792ea23d1c..33410bc9c4 100644
--- a/patches.suse/0001-vfs-Hooks-for-more-fine-grained-directory-permission.patch
+++ b/patches.suse/0001-vfs-Hooks-for-more-fine-grained-directory-permission.patch
@@ -209,7 +209,7 @@ Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1542,6 +1542,10 @@ struct inode_operations {
- void (*truncate_range)(struct inode *, loff_t, loff_t);
+ void (*truncate_range)(struct inode *, loff_t, loff_t);
int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
u64 len);
+ int (*may_create) (struct inode *, int);
diff --git a/patches.suse/0002-vfs-Add-generic-IS_ACL-test-for-acl-support.patch b/patches.suse/0002-vfs-Add-generic-IS_ACL-test-for-acl-support.patch
index 688911b76f..fe3e1e8ecc 100644
--- a/patches.suse/0002-vfs-Add-generic-IS_ACL-test-for-acl-support.patch
+++ b/patches.suse/0002-vfs-Add-generic-IS_ACL-test-for-acl-support.patch
@@ -21,9 +21,9 @@ Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2215,7 +2215,7 @@ static int __open_namei_create(struct na
- /* Negative dentry, just create the file */
+ /* Negative dentry, just create the file */
if (!dentry->d_inode) {
- int mode = op->mode;
+ int mode = op->mode;
- if (!IS_POSIXACL(dir->d_inode))
+ if (!IS_ACL(dir->d_inode))
mode &= ~current_umask();
diff --git a/patches.suse/0015-ext4-Use-IS_POSIXACL-to-check-for-POSIX-ACL-support.patch b/patches.suse/0015-ext4-Use-IS_POSIXACL-to-check-for-POSIX-ACL-support.patch
index 3198a9c8e4..7e3318a922 100644
--- a/patches.suse/0015-ext4-Use-IS_POSIXACL-to-check-for-POSIX-ACL-support.patch
+++ b/patches.suse/0015-ext4-Use-IS_POSIXACL-to-check-for-POSIX-ACL-support.patch
@@ -101,7 +101,7 @@ Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -974,9 +974,9 @@ static int ext4_show_options(struct seq_
- seq_puts(seq, ",nouser_xattr");
+ seq_puts(seq, ",nouser_xattr");
#endif
#ifdef CONFIG_EXT4_FS_POSIX_ACL
- if (test_opt(sb, POSIX_ACL) && !(def_mount_opts & EXT4_DEFM_ACL))
@@ -126,13 +126,13 @@ Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
#else
case Opt_acl:
@@ -2644,7 +2644,7 @@ static int ext4_fill_super(struct super_
- set_opt(sb, XATTR_USER);
+ set_opt(sb, XATTR_USER);
#endif
#ifdef CONFIG_EXT4_FS_POSIX_ACL
- set_opt(sb, POSIX_ACL);
+ sb->s_flags |= MS_POSIXACL;
#endif
- set_opt(sb, MBLK_IO_SUBMIT);
+ set_opt(sb, MBLK_IO_SUBMIT);
if ((def_mount_opts & EXT4_DEFM_JMODE) == EXT4_DEFM_JMODE_DATA)
@@ -2691,9 +2691,6 @@ static int ext4_fill_super(struct super_
&journal_ioprio, NULL, 0))
diff --git a/patches.suse/0016-ext4-Implement-richacl-support-in-ext4.patch b/patches.suse/0016-ext4-Implement-richacl-support-in-ext4.patch
index 35b5a8cdc2..74fde29065 100644
--- a/patches.suse/0016-ext4-Implement-richacl-support-in-ext4.patch
+++ b/patches.suse/0016-ext4-Implement-richacl-support-in-ext4.patch
@@ -73,7 +73,7 @@ Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
* Called when an inode is released. Note that this is different
@@ -161,5 +162,8 @@ const struct inode_operations ext4_file_
#endif
- .check_acl = ext4_check_acl,
+ .check_acl = ext4_check_acl,
.fiemap = ext4_fiemap,
+ .permission = ext4_permission,
+ .may_create = ext4_may_create,
@@ -116,7 +116,7 @@ Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
@@ -5041,6 +5042,9 @@ struct inode *ext4_iget(struct super_blo
inode->i_nlink = le16_to_cpu(raw_inode->i_links_count);
- ext4_clear_state_flags(ei); /* Only relevant on 32-bit archs */
+ ext4_clear_state_flags(ei); /* Only relevant on 32-bit archs */
+#ifdef CONFIG_EXT4_FS_RICHACL
+ ei->i_richacl = EXT4_RICHACL_NOT_CACHED;
+#endif
@@ -571,7 +571,7 @@ Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
if (EXT4_I(inode)->jinode) {
jbd2_journal_release_jbd_inode(EXT4_JOURNAL(inode),
@@ -973,10 +983,13 @@ static int ext4_show_options(struct seq_
- if (!test_opt(sb, XATTR_USER))
+ if (!test_opt(sb, XATTR_USER))
seq_puts(seq, ",nouser_xattr");
#endif
-#ifdef CONFIG_EXT4_FS_POSIX_ACL
@@ -642,9 +642,9 @@ Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
#endif
-#ifdef CONFIG_EXT4_FS_POSIX_ACL
+#if defined(CONFIG_EXT4_FS_POSIX_ACL)
- sb->s_flags |= MS_POSIXACL;
+ sb->s_flags |= MS_POSIXACL;
#endif
- set_opt(sb, MBLK_IO_SUBMIT);
+ set_opt(sb, MBLK_IO_SUBMIT);
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
@@ -107,6 +107,9 @@ static const struct xattr_handler *ext4_
diff --git a/patches.suse/dm-mpath-no-activate-for-offlined-paths b/patches.suse/dm-mpath-no-activate-for-offlined-paths
index cc885dd24a..90eb174c6b 100644
--- a/patches.suse/dm-mpath-no-activate-for-offlined-paths
+++ b/patches.suse/dm-mpath-no-activate-for-offlined-paths
@@ -38,8 +38,8 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
+ errors = 0;
+ break;
case SCSI_DH_RETRY:
- /* Wait before retrying. */
- delay_retry = 1;
+ /* Wait before retrying. */
+ delay_retry = 1;
@@ -1264,7 +1269,8 @@ static void pg_init_done(void *data, int
spin_lock_irqsave(&m->lock, flags);
if (errors) {
diff --git a/patches.suse/dm-mpath-no-partitions-feature b/patches.suse/dm-mpath-no-partitions-feature
index a12a69623d..bbccaa1508 100644
--- a/patches.suse/dm-mpath-no-partitions-feature
+++ b/patches.suse/dm-mpath-no-partitions-feature
@@ -33,7 +33,7 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
@@ -83,6 +85,7 @@ struct multipath {
unsigned pg_init_retries; /* Number of times to retry pg_init */
unsigned pg_init_count; /* Number of times pg_init called */
- unsigned pg_init_delay_msecs; /* Number of msecs before pg_init retry */
+ unsigned pg_init_delay_msecs; /* Number of msecs before pg_init retry */
+ unsigned features; /* Additional selected features */
struct work_struct process_queued_ios;
@@ -62,6 +62,6 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
DMEMIT("pg_init_retries %u ", m->pg_init_retries);
+ if (m->features & FEATURE_NO_PARTITIONS)
+ DMEMIT("no_partitions ");
- if (m->pg_init_delay_msecs != DM_PG_INIT_DELAY_DEFAULT)
- DMEMIT("pg_init_delay_msecs %u ", m->pg_init_delay_msecs);
+ if (m->pg_init_delay_msecs != DM_PG_INIT_DELAY_DEFAULT)
+ DMEMIT("pg_init_delay_msecs %u ", m->pg_init_delay_msecs);
}
diff --git a/patches.suse/no-frame-pointer-select b/patches.suse/no-frame-pointer-select
index 5c6091b2e6..9cd2576e57 100644
--- a/patches.suse/no-frame-pointer-select
+++ b/patches.suse/no-frame-pointer-select
@@ -29,10 +29,10 @@ Acked-by: Jan Beulich <jbeulich@novell.com>
config LATENCYTOP
bool "Latency measuring infrastructure"
- depends on HAVE_LATENCYTOP_SUPPORT
- depends on DEBUG_KERNEL
- depends on STACKTRACE_SUPPORT
- depends on PROC_FS
+ depends on HAVE_LATENCYTOP_SUPPORT
+ depends on DEBUG_KERNEL
+ depends on STACKTRACE_SUPPORT
+ depends on PROC_FS
- select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE
+ select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !X86
+ select UNWIND_INFO if X86 && !FRAME_POINTER
diff --git a/patches.suse/no-partition-scan b/patches.suse/no-partition-scan
index 2ede4e4ace..73fdbbd4e9 100644
--- a/patches.suse/no-partition-scan
+++ b/patches.suse/no-partition-scan
@@ -105,4 +105,4 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
+#define GENHD_FL_NO_PARTITION_SCAN 512
enum {
- DISK_EVENT_MEDIA_CHANGE = 1 << 0, /* media changed */
+ DISK_EVENT_MEDIA_CHANGE = 1 << 0, /* media changed */
diff --git a/patches.suse/revert-x86-remove-warning-and-warning_symbol-from-struct-stacktrace_ops b/patches.suse/revert-x86-remove-warning-and-warning_symbol-from-struct-stacktrace_ops
index c7ca52e4b8..02cadcdec4 100644
--- a/patches.suse/revert-x86-remove-warning-and-warning_symbol-from-struct-stacktrace_ops
+++ b/patches.suse/revert-x86-remove-warning-and-warning_symbol-from-struct-stacktrace_ops
@@ -33,7 +33,7 @@ diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace
index d7e89c8..70bbe39 100644
--- a/arch/x86/include/asm/stacktrace.h
+++ b/arch/x86/include/asm/stacktrace.h
-@@ -37,6 +37,9 @
+@@ -37,6 +37,9 @@
/* Generic stack tracer with callbacks */
struct stacktrace_ops {
@@ -47,7 +47,7 @@ diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index 0de6b2b..3a0338b 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
-@@ -1773,6 +1773,17 @
+@@ -1773,6 +1773,17 @@
* callchain support
*/
@@ -65,7 +65,7 @@ index 0de6b2b..3a0338b 100644
static int backtrace_stack(void *data, char *name)
{
return 0;
-@@ -1786,6 +1797,8 @
+@@ -1786,6 +1797,8 @@
}
static const struct stacktrace_ops backtrace_ops = {
@@ -78,7 +78,7 @@ diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index e2a3f06..f478ff6 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
-@@ -135,6 +135,20 @
+@@ -135,6 +135,20 @@
}
EXPORT_SYMBOL_GPL(print_context_stack_bp);
@@ -99,7 +99,7 @@ index e2a3f06..f478ff6 100644
static int print_trace_stack(void *data, char *name)
{
printk("%s <%s> ", (char *)data, name);
-@@ -152,6 +166,8 @
+@@ -152,6 +166,8 @@
}
static const struct stacktrace_ops print_trace_ops = {
@@ -112,7 +112,7 @@ diff --git a/arch/x86/kernel/stacktrace.c b/arch/x86/kernel/stacktrace.c
index 6515733..55d9bc0 100644
--- a/arch/x86/kernel/stacktrace.c
+++ b/arch/x86/kernel/stacktrace.c
-@@ -9,6 +9,15 @
+@@ -9,6 +9,15 @@
#include <linux/uaccess.h>
#include <asm/stacktrace.h>
@@ -128,7 +128,7 @@ index 6515733..55d9bc0 100644
static int save_stack_stack(void *data, char *name)
{
return 0;
-@@ -44,12 +53,16 @
+@@ -44,12 +53,16 @@
}
static const struct stacktrace_ops save_stack_ops = {
@@ -149,7 +149,7 @@ diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
index 2d49d4e..a5b64ab 100644
--- a/arch/x86/oprofile/backtrace.c
+++ b/arch/x86/oprofile/backtrace.c
-@@ -16,6 +16,17 @
+@@ -16,6 +16,17 @@
#include <asm/stacktrace.h>
#include <linux/compat.h>
@@ -167,7 +167,7 @@ index 2d49d4e..a5b64ab 100644
static int backtrace_stack(void *data, char *name)
{
/* Yes, we want all stacks */
-@@ -31,6 +42,8 @
+@@ -31,6 +42,8 @@
}
static struct stacktrace_ops backtrace_ops = {
diff --git a/patches.suse/setuid-dumpable-wrongdir b/patches.suse/setuid-dumpable-wrongdir
index cf919a4d7c..7525187bea 100644
--- a/patches.suse/setuid-dumpable-wrongdir
+++ b/patches.suse/setuid-dumpable-wrongdir
@@ -39,7 +39,7 @@ Signed-off-by: Kurt Garloff <garloff@suse.de>
--- a/kernel/sysctl_binary.c
+++ b/kernel/sysctl_binary.c
@@ -138,6 +138,7 @@ static const struct bin_table bin_kern_t
- { CTL_INT, KERN_COMPAT_LOG, "compat-log" },
+ { CTL_INT, KERN_COMPAT_LOG, "compat-log" },
{ CTL_INT, KERN_MAX_LOCK_DEPTH, "max_lock_depth" },
{ CTL_INT, KERN_PANIC_ON_NMI, "panic_on_unrecovered_nmi" },
+ { CTL_INT, KERN_SETUID_DUMPABLE, "suid_dumpable" },
diff --git a/patches.suse/stack-unwind b/patches.suse/stack-unwind
index 0530fb678e..b5b0a2940c 100644
--- a/patches.suse/stack-unwind
+++ b/patches.suse/stack-unwind
@@ -742,7 +742,7 @@ Update Jul 02 2010 jbeulich:
@@ -576,6 +578,7 @@ asmlinkage void __init start_kernel(void
mm_init_owner(&init_mm, &init_task);
- mm_init_cpumask(&init_mm);
+ mm_init_cpumask(&init_mm);
setup_command_line(command_line);
+ unwind_setup();
setup_nr_cpu_ids();
diff --git a/patches.suse/supported-flag-enterprise b/patches.suse/supported-flag-enterprise
index 2d4509836f..599c80eaad 100644
--- a/patches.suse/supported-flag-enterprise
+++ b/patches.suse/supported-flag-enterprise
@@ -95,7 +95,7 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com>
+#endif
static struct attribute * kernel_attrs[] = {
- &fscaps_attr.attr,
+ &fscaps_attr.attr,
@@ -193,7 +195,9 @@ static struct attribute * kernel_attrs[]
&kexec_crash_size_attr.attr,
&vmcoreinfo_attr.attr,