diff options
| author | Joel Becker <jlbec@evilplan.org> | 2011-05-26 00:51:55 -0400 |
|---|---|---|
| committer | Joel Becker <jlbec@evilplan.org> | 2011-05-26 00:51:55 -0400 |
| commit | ece928df16494becd43f999aff9bd530182e7e81 (patch) | |
| tree | 905042764ea5d8ab6eda63666406e19f607bcf4c /arch/x86/kernel/apic/io_apic.c | |
| parent | 3d1c1829ebe7e8bb48a997b39b4865abc9197e5e (diff) | |
| parent | dda54e76d7dba0532ebdd72e0b4f492a03f83225 (diff) | |
Merge branch 'move_extents' of git://oss.oracle.com/git/tye/linux-2.6 into ocfs2-merge-window
Conflicts:
fs/ocfs2/ioctl.c
Diffstat (limited to 'arch/x86/kernel/apic/io_apic.c')
| -rw-r--r-- | arch/x86/kernel/apic/io_apic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 9488dcff7aec..e5293394b548 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c | |||
| @@ -676,7 +676,7 @@ void mask_ioapic_entries(void) | |||
| 676 | int apic, pin; | 676 | int apic, pin; |
| 677 | 677 | ||
| 678 | for (apic = 0; apic < nr_ioapics; apic++) { | 678 | for (apic = 0; apic < nr_ioapics; apic++) { |
| 679 | if (ioapics[apic].saved_registers) | 679 | if (!ioapics[apic].saved_registers) |
| 680 | continue; | 680 | continue; |
| 681 | 681 | ||
| 682 | for (pin = 0; pin < ioapics[apic].nr_registers; pin++) { | 682 | for (pin = 0; pin < ioapics[apic].nr_registers; pin++) { |
| @@ -699,7 +699,7 @@ int restore_ioapic_entries(void) | |||
| 699 | int apic, pin; | 699 | int apic, pin; |
| 700 | 700 | ||
| 701 | for (apic = 0; apic < nr_ioapics; apic++) { | 701 | for (apic = 0; apic < nr_ioapics; apic++) { |
| 702 | if (ioapics[apic].saved_registers) | 702 | if (!ioapics[apic].saved_registers) |
| 703 | continue; | 703 | continue; |
| 704 | 704 | ||
| 705 | for (pin = 0; pin < ioapics[apic].nr_registers; pin++) | 705 | for (pin = 0; pin < ioapics[apic].nr_registers; pin++) |