diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-29 17:29:30 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-29 17:29:30 +0100 |
| commit | 547598d3a91f11b1f802bf0b122f777c3c22f26d (patch) | |
| tree | b2177817268babf6755e151b6e3c5d385d1748a7 /arch/sparc64/kernel/mdesc.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol... (diff) | |
| parent | [SPARC64]: Adjust kernel PC validation test in fault handler. (diff) | |
| download | linux-547598d3a91f11b1f802bf0b122f777c3c22f26d.tar.xz linux-547598d3a91f11b1f802bf0b122f777c3c22f26d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Adjust kernel PC validation test in fault handler.
[SPARC64]: Loosen checks in exception table handling.
[SPARC64]: Fix section mismatch from kernel_map_range
[SPARC64]: Fix section mismatchs from dr_cpu_data
[SPARC]: Fix build in arch/sparc/kernel/led.c
Diffstat (limited to 'arch/sparc64/kernel/mdesc.c')
| -rw-r--r-- | arch/sparc64/kernel/mdesc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/mdesc.c b/arch/sparc64/kernel/mdesc.c index 856659bb1311..910083589569 100644 --- a/arch/sparc64/kernel/mdesc.c +++ b/arch/sparc64/kernel/mdesc.c @@ -758,7 +758,7 @@ static void __devinit get_mondo_data(struct mdesc_handle *hp, u64 mp, get_one_mondo_bits(val, &tb->nonresum_qmask, 2); } -void __devinit mdesc_fill_in_cpu_data(cpumask_t mask) +void __cpuinit mdesc_fill_in_cpu_data(cpumask_t mask) { struct mdesc_handle *hp = mdesc_grab(); u64 mp; |