Merge ../linux-2.6
This commit is contained in:
@@ -74,19 +74,19 @@ EXPORT_SYMBOL(__debugger_dabr_match);
|
||||
EXPORT_SYMBOL(__debugger_fault_handler);
|
||||
#endif
|
||||
|
||||
struct notifier_block *powerpc_die_chain;
|
||||
static DEFINE_SPINLOCK(die_notifier_lock);
|
||||
ATOMIC_NOTIFIER_HEAD(powerpc_die_chain);
|
||||
|
||||
int register_die_notifier(struct notifier_block *nb)
|
||||
{
|
||||
int err = 0;
|
||||
unsigned long flags;
|
||||
|
||||
spin_lock_irqsave(&die_notifier_lock, flags);
|
||||
err = notifier_chain_register(&powerpc_die_chain, nb);
|
||||
spin_unlock_irqrestore(&die_notifier_lock, flags);
|
||||
return err;
|
||||
return atomic_notifier_chain_register(&powerpc_die_chain, nb);
|
||||
}
|
||||
EXPORT_SYMBOL(register_die_notifier);
|
||||
|
||||
int unregister_die_notifier(struct notifier_block *nb)
|
||||
{
|
||||
return atomic_notifier_chain_unregister(&powerpc_die_chain, nb);
|
||||
}
|
||||
EXPORT_SYMBOL(unregister_die_notifier);
|
||||
|
||||
/*
|
||||
* Trap & Exception support
|
||||
|
Reference in New Issue
Block a user