diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 13:24:52 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 13:24:52 -0500 |
commit | 21511abd0a248a3f225d3b611cfabb93124605a7 (patch) | |
tree | eb490f94322f3c76169ea7e5ec09524f275f390e /arch/ia64/kernel/setup.c | |
parent | 39ce941ec15032c0efc3632b9f00a6b2365e1870 (diff) | |
parent | e1b0d4ba46b42909d11ea152a6b56ee76f062ca3 (diff) |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] make pfm_get_task work with virtual pids
[IA64] honor notify_die() returning NOTIFY_STOP
[IA64] remove dead code: __cpu_{down,die} from !HOTPLUG_CPU
[IA64] Appoint kvm/ia64 Maintainers
[IA64] ia64_set_psr should use srlz.i
[IA64] Export three symbols for module use
[IA64] mca style cleanup
[IA64] sn_hwperf semaphore to mutex
[IA64] generalize attribute of fsyscall_gtod_data
[IA64] efi.c Add /* never reached */ annotation
[IA64] efi.c Spelling/punctuation fixes
[IA64] Make efi.c mostly fit in 80 columns
[IA64] aliasing-test: fix gcc warnings on non-ia64
[IA64] Slim-down __clear_bit_unlock
[IA64] Fix the order of atomic operations in restore_previous_kprobes on ia64
[IA64] constify function pointer tables
[IA64] fix userspace compile error in gcc_intrin.h
Diffstat (limited to 'arch/ia64/kernel/setup.c')
-rw-r--r-- | arch/ia64/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index 86028c69861e..ebd1a09f3201 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c | |||
@@ -654,7 +654,7 @@ c_stop (struct seq_file *m, void *v) | |||
654 | { | 654 | { |
655 | } | 655 | } |
656 | 656 | ||
657 | struct seq_operations cpuinfo_op = { | 657 | const struct seq_operations cpuinfo_op = { |
658 | .start = c_start, | 658 | .start = c_start, |
659 | .next = c_next, | 659 | .next = c_next, |
660 | .stop = c_stop, | 660 | .stop = c_stop, |