diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-14 08:16:21 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-14 09:44:08 +0100 |
| commit | 62395efdb0ef42e664ca81677901268c403a6286 (patch) | |
| tree | 7ce9e6ba8b3fa0c004f852b56966e96ad948d2f8 /arch/x86/kernel/quirks.c | |
| parent | ccd50dfd92ea2c4ba9e39531ac55db53393e783e (diff) | |
| parent | 88200bc28da38bcda1cb1bd218216e83b426d8a8 (diff) | |
Merge branch 'x86/asm' into tracing/syscalls
We need the wider TIF work-mask checks in entry_32.S.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/quirks.c')
| -rw-r--r-- | arch/x86/kernel/quirks.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c index 309949e9e1c1..6a5a2970f4c5 100644 --- a/arch/x86/kernel/quirks.c +++ b/arch/x86/kernel/quirks.c @@ -74,8 +74,7 @@ static void ich_force_hpet_resume(void) if (!force_hpet_address) return; - if (rcba_base == NULL) - BUG(); + BUG_ON(rcba_base == NULL); /* read the Function Disable register, dword mode only */ val = readl(rcba_base + 0x3404); |