diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-05 08:27:42 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-05 08:27:42 -0400 |
| commit | cf57a308436653f3094590202c77459aab250ff3 (patch) | |
| tree | 8a9e7096e494141911147a1f24865c3d79d583c1 /arch/x86_64/lib/thunk.S | |
| parent | faac9bd0e3ce7cb0572ec66e0a426cacf6afa970 (diff) | |
| parent | ca78f6baca863afe2e6a244a0fe94b3a70211d46 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/x86_64/lib/thunk.S')
| -rw-r--r-- | arch/x86_64/lib/thunk.S | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86_64/lib/thunk.S b/arch/x86_64/lib/thunk.S index e49af0032e94..332ea5dff916 100644 --- a/arch/x86_64/lib/thunk.S +++ b/arch/x86_64/lib/thunk.S | |||
| @@ -47,6 +47,11 @@ | |||
| 47 | thunk_retrax __down_failed_interruptible,__down_interruptible | 47 | thunk_retrax __down_failed_interruptible,__down_interruptible |
| 48 | thunk_retrax __down_failed_trylock,__down_trylock | 48 | thunk_retrax __down_failed_trylock,__down_trylock |
| 49 | thunk __up_wakeup,__up | 49 | thunk __up_wakeup,__up |
| 50 | |||
| 51 | #ifdef CONFIG_TRACE_IRQFLAGS | ||
| 52 | thunk trace_hardirqs_on_thunk,trace_hardirqs_on | ||
| 53 | thunk trace_hardirqs_off_thunk,trace_hardirqs_off | ||
| 54 | #endif | ||
| 50 | 55 | ||
| 51 | /* SAVE_ARGS below is used only for the .cfi directives it contains. */ | 56 | /* SAVE_ARGS below is used only for the .cfi directives it contains. */ |
| 52 | CFI_STARTPROC | 57 | CFI_STARTPROC |