Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit fce637e392a762e4d4f0fc41ac3d3f557187ac21

Authored by Linus Torvalds
3 parents 8b29336fe0 c4dbe54ed7 def945eeb9
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

Merge branches 'core-fixes-for-linus' and 'irq-fixes-for-linus' of git://git.ker… 

…nel.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

Showing 5 changed files Side-by-side Diff

arch/ia64/kernel/time.c
Diff comments   View file @ fce637e
... ... @@ -36,7 +36,7 @@
36 36 static cycle_t itc_get_cycles(struct clocksource *cs);
37 37  
38 38 struct fsyscall_gtod_data_t fsyscall_gtod_data = {
39   - .lock = SEQLOCK_UNLOCKED,
  39 + .lock = __SEQLOCK_UNLOCKED(fsyscall_gtod_data.lock),
40 40 };
41 41  
42 42 struct itc_jitter_data_t itc_jitter_data;
arch/x86/kernel/vsyscall_64.c
Diff comments   View file @ fce637e
... ... @@ -59,7 +59,7 @@
59 59  
60 60 struct vsyscall_gtod_data __vsyscall_gtod_data __section_vsyscall_gtod_data =
61 61 {
62   - .lock = SEQLOCK_UNLOCKED,
  62 + .lock = __SEQLOCK_UNLOCKED(__vsyscall_gtod_data.lock),
63 63 .sysctl_enabled = 1,
64 64 };
65 65  
include/linux/seqlock.h
Diff comments   View file @ fce637e
... ... @@ -41,9 +41,6 @@
41 41 #define __SEQLOCK_UNLOCKED(lockname) \
42 42 { 0, __SPIN_LOCK_UNLOCKED(lockname) }
43 43  
44   -#define SEQLOCK_UNLOCKED \
45   - __SEQLOCK_UNLOCKED(old_style_seqlock_init)
46   -
47 44 #define seqlock_init(x) \
48 45 do { \
49 46 (x)->sequence = 0; \
... ... @@ -352,6 +352,7 @@
352 352 #ifdef CONFIG_SMP
353 353 remove_proc_entry("smp_affinity", desc->dir);
354 354 remove_proc_entry("affinity_hint", desc->dir);
  355 + remove_proc_entry("smp_affinity_list", desc->dir);
355 356 remove_proc_entry("node", desc->dir);
356 357 #endif
357 358 remove_proc_entry("spurious", desc->dir);
net/ipv4/inet_connection_sock.c
Diff comments   View file @ fce637e
... ... @@ -33,7 +33,7 @@
33 33 * This struct holds the first and last local port number.
34 34 */
35 35 struct local_ports sysctl_local_ports __read_mostly = {
36   - .lock = SEQLOCK_UNLOCKED,
  36 + .lock = __SEQLOCK_UNLOCKED(sysctl_local_ports.lock),
37 37 .range = { 32768, 61000 },
38 38 };
39 39