lkml.org 
[lkml]   [2015]   [Apr]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the akpm-current tree with the tile tree
Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
include/linux/nmi.h between commit e164ade07b21 ("watchdog: add
watchdog_exclude sysctl to assist nohz") from the tile tree and commit
866d62a433cc ("watchdog: enable the new user interface of the watchdog
mechanism") from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc include/linux/nmi.h
index 1703829c5812,3d46fb4708e0..000000000000
--- a/include/linux/nmi.h
+++ b/include/linux/nmi.h
@@@ -68,15 -63,20 +63,23 @@@ static inline bool trigger_allbutself_c
#ifdef CONFIG_LOCKUP_DETECTOR
int hw_nmi_is_cpu_stuck(struct pt_regs *);
u64 hw_nmi_get_sample_period(int watchdog_thresh);
+ extern int nmi_watchdog_enabled;
+ extern int soft_watchdog_enabled;
extern int watchdog_user_enabled;
extern int watchdog_thresh;
+extern unsigned long *watchdog_exclude_mask_bits;
extern int sysctl_softlockup_all_cpu_backtrace;
struct ctl_table;
- extern int proc_dowatchdog(struct ctl_table *, int ,
- void __user *, size_t *, loff_t *);
+ extern int proc_watchdog(struct ctl_table *, int ,
+ void __user *, size_t *, loff_t *);
+ extern int proc_nmi_watchdog(struct ctl_table *, int ,
+ void __user *, size_t *, loff_t *);
+ extern int proc_soft_watchdog(struct ctl_table *, int ,
+ void __user *, size_t *, loff_t *);
+ extern int proc_watchdog_thresh(struct ctl_table *, int ,
+ void __user *, size_t *, loff_t *);
+extern int proc_dowatchdog_exclude(struct ctl_table *, int,
+ void __user *, size_t *, loff_t *);
#endif

#ifdef CONFIG_HAVE_ACPI_APEI_NMI
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2015-04-07 13:41    [W:0.105 / U:0.108 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site