diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-03 17:18:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-03 17:18:52 -0700 |
| commit | a8adc0f0911227996b3e79690562e6e325e4c09b (patch) | |
| tree | 69a9821bb3aba0b4567d0540de794908c65edfff /arch/x86/kernel/apic/x2apic_uv_x.c | |
| parent | 3ef0a61a467639cf7def299309cd9ea524c3e1c1 (diff) | |
| parent | 744c193eb9a223ccb2e60500196cf590b3a6131a (diff) | |
| download | blackbird-op-linux-a8adc0f0911227996b3e79690562e6e325e4c09b.tar.gz blackbird-op-linux-a8adc0f0911227996b3e79690562e6e325e4c09b.zip | |
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cleanups from Ingo Molnar:
"Header file and a wrapper functions cleanup"
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: Migrate exception table users off module.h and onto extable.h
x86: Clean up various simple wrapper functions
Diffstat (limited to 'arch/x86/kernel/apic/x2apic_uv_x.c')
| -rw-r--r-- | arch/x86/kernel/apic/x2apic_uv_x.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index b9f6157d4271..f034c84f74c3 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -533,11 +533,8 @@ static unsigned int x2apic_get_apic_id(unsigned long x) static unsigned long set_apic_id(unsigned int id) { - unsigned long x; - - /* maskout x2apic_extra_bits ? */ - x = id; - return x; + /* CHECKME: Do we need to mask out the xapic extra bits? */ + return id; } static unsigned int uv_read_apic_id(void) |
