Commit fce637e3 authored by Linus Torvalds's avatar Linus Torvalds

Merge branches 'core-fixes-for-linus' and 'irq-fixes-for-linus' of...

Merge branches 'core-fixes-for-linus' and 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  seqlock: Get rid of SEQLOCK_UNLOCKED

* 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  irq: Remove smp_affinity_list when unregister irq proc
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
static cycle_t itc_get_cycles(struct clocksource *cs); static cycle_t itc_get_cycles(struct clocksource *cs);
struct fsyscall_gtod_data_t fsyscall_gtod_data = { struct fsyscall_gtod_data_t fsyscall_gtod_data = {
.lock = SEQLOCK_UNLOCKED, .lock = __SEQLOCK_UNLOCKED(fsyscall_gtod_data.lock),
}; };
struct itc_jitter_data_t itc_jitter_data; struct itc_jitter_data_t itc_jitter_data;
......
...@@ -59,7 +59,7 @@ int __vgetcpu_mode __section_vgetcpu_mode; ...@@ -59,7 +59,7 @@ int __vgetcpu_mode __section_vgetcpu_mode;
struct vsyscall_gtod_data __vsyscall_gtod_data __section_vsyscall_gtod_data = struct vsyscall_gtod_data __vsyscall_gtod_data __section_vsyscall_gtod_data =
{ {
.lock = SEQLOCK_UNLOCKED, .lock = __SEQLOCK_UNLOCKED(__vsyscall_gtod_data.lock),
.sysctl_enabled = 1, .sysctl_enabled = 1,
}; };
......
...@@ -41,9 +41,6 @@ typedef struct { ...@@ -41,9 +41,6 @@ typedef struct {
#define __SEQLOCK_UNLOCKED(lockname) \ #define __SEQLOCK_UNLOCKED(lockname) \
{ 0, __SPIN_LOCK_UNLOCKED(lockname) } { 0, __SPIN_LOCK_UNLOCKED(lockname) }
#define SEQLOCK_UNLOCKED \
__SEQLOCK_UNLOCKED(old_style_seqlock_init)
#define seqlock_init(x) \ #define seqlock_init(x) \
do { \ do { \
(x)->sequence = 0; \ (x)->sequence = 0; \
......
...@@ -352,6 +352,7 @@ void unregister_irq_proc(unsigned int irq, struct irq_desc *desc) ...@@ -352,6 +352,7 @@ void unregister_irq_proc(unsigned int irq, struct irq_desc *desc)
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
remove_proc_entry("smp_affinity", desc->dir); remove_proc_entry("smp_affinity", desc->dir);
remove_proc_entry("affinity_hint", desc->dir); remove_proc_entry("affinity_hint", desc->dir);
remove_proc_entry("smp_affinity_list", desc->dir);
remove_proc_entry("node", desc->dir); remove_proc_entry("node", desc->dir);
#endif #endif
remove_proc_entry("spurious", desc->dir); remove_proc_entry("spurious", desc->dir);
......
...@@ -33,7 +33,7 @@ EXPORT_SYMBOL(inet_csk_timer_bug_msg); ...@@ -33,7 +33,7 @@ EXPORT_SYMBOL(inet_csk_timer_bug_msg);
* This struct holds the first and last local port number. * This struct holds the first and last local port number.
*/ */
struct local_ports sysctl_local_ports __read_mostly = { struct local_ports sysctl_local_ports __read_mostly = {
.lock = SEQLOCK_UNLOCKED, .lock = __SEQLOCK_UNLOCKED(sysctl_local_ports.lock),
.range = { 32768, 61000 }, .range = { 32768, 61000 },
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment