diff options
author | Paul Mackerras <paulus@samba.org> | 2006-03-29 04:24:50 +0200 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-29 04:24:50 +0200 |
commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /arch/xtensa/platform-iss/setup.c | |
parent | [PATCH] powerpc: Kill _machine and hard-coded platform numbers (diff) | |
parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
download | linux-bac30d1a78d0f11c613968fc8b351a91ed465386.tar.xz linux-bac30d1a78d0f11c613968fc8b351a91ed465386.zip |
Merge ../linux-2.6
Diffstat (limited to 'arch/xtensa/platform-iss/setup.c')
-rw-r--r-- | arch/xtensa/platform-iss/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/platform-iss/setup.c b/arch/xtensa/platform-iss/setup.c index 2e6dcbf0cc04..23790a5610e2 100644 --- a/arch/xtensa/platform-iss/setup.c +++ b/arch/xtensa/platform-iss/setup.c @@ -108,5 +108,5 @@ static struct notifier_block iss_panic_block = { void __init platform_setup(char **p_cmdline) { - notifier_chain_register(&panic_notifier_list, &iss_panic_block); + atomic_notifier_chain_register(&panic_notifier_list, &iss_panic_block); } |