Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08815bc2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86/cleanups from Ingo Molnar:
 "Smaller cleanups"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  arch/x86: Remove unecessary semicolons
  x86, boot: Remove obsolete and unused constant RAMDISK
parents 67b1f348 4b8073e4

arch/x86/boot/header.S

+0 −4
Original line number Diff line number Diff line
@@ -32,10 +32,6 @@ SYSSEG = 0x1000 /* historical load address >> 4 */ 
#define SVGA_MODE ASK_VGA

#endif



#ifndef RAMDISK

#define RAMDISK 0

#endif



#ifndef ROOT_RDONLY

#define ROOT_RDONLY 1

#endif

arch/x86/kernel/alternative.c

+2 −2
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end, 
		/* turn DS segment override prefix into lock prefix */

		if (*ptr == 0x3e)

			text_poke(ptr, ((unsigned char []){0xf0}), 1);

	};

	}

	mutex_unlock(&text_mutex);

}
@@ -322,7 +322,7 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end, 
		/* turn lock prefix into DS segment override prefix */

		if (*ptr == 0xf0)

			text_poke(ptr, ((unsigned char []){0x3E}), 1);

	};

	}

	mutex_unlock(&text_mutex);

}

arch/x86/kernel/apic/apic.c

+1 −1
Original line number Diff line number Diff line
@@ -1934,7 +1934,7 @@ void smp_error_interrupt(struct pt_regs *regs) 
			apic_printk(APIC_DEBUG, KERN_CONT " : %s", error_interrupt_reason[i]);

		i++;

		v1 >>= 1;

	};

	}



	apic_printk(APIC_DEBUG, KERN_CONT "\n");

arch/x86/kvm/vmx.c

+1 −1
Original line number Diff line number Diff line
@@ -4543,7 +4543,7 @@ static int handle_cr(struct kvm_vcpu *vcpu) 
				vcpu->run->exit_reason = KVM_EXIT_SET_TPR;

				return 0;

			}

		};

		}

		break;

	case 2: /* clts */

		handle_clts(vcpu);

arch/x86/pci/mmconfig-shared.c

+1 −1
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ static int __init pci_parse_mcfg(struct acpi_table_header *header) 
	while (i >= sizeof(struct acpi_mcfg_allocation)) {

		entries++;

		i -= sizeof(struct acpi_mcfg_allocation);

	};

	}

	if (entries == 0) {

		pr_err(PREFIX "MMCONFIG has no entries\n");

		return -ENODEV;