---

yaml
---
r: 64748
b: refs/heads/master
c: 15bde2f
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e3cbe4c274b2794fd2888f2c71ea97c9b5f9519
+refs/heads/master: 15bde2f1a8e819213f54314505a5a0509673109b

trunk/arch/i386/boot/pm.c

@@ -122,11 +122,7 @@ static void setup_gdt(void)
 		/* DS: data, read/write, 4 GB, base 0 */
 		[GDT_ENTRY_BOOT_DS] = GDT_ENTRY(0xc093, 0, 0xfffff),
 	};
-	/* Xen HVM incorrectly stores a pointer to the gdt_ptr, instead
-	   of the gdt_ptr contents.  Thus, make it static so it will
-	   stay in memory, at least long enough that we switch to the
-	   proper kernel GDT. */
-	static struct gdt_ptr gdt;
+	struct gdt_ptr gdt;
 
 	gdt.len = sizeof(boot_gdt)-1;
 	gdt.ptr = (u32)&boot_gdt + (ds() << 4);

trunk/arch/m32r/Kconfig

@@ -57,13 +57,9 @@ config PLAT_MAPPI
 
 config PLAT_USRV
 	bool "uServer"
-	select PLAT_HAS_INT1ICU
 
 config PLAT_M32700UT
 	bool "M32700UT"
-	select PLAT_HAS_INT0ICU
-	select PLAT_HAS_INT1ICU
-	select PLAT_HAS_INT2ICU
 	help
 	  The M3T-M32700UT is an evaluation board based on uT-Engine
 	  specification.  This board has an M32700 (Chaos) evaluation chip.
@@ -72,9 +68,6 @@ config PLAT_M32700UT
 
 config PLAT_OPSPUT
 	bool "OPSPUT"
-	select PLAT_HAS_INT0ICU
-	select PLAT_HAS_INT1ICU
-	select PLAT_HAS_INT2ICU
 	help
 	  The OPSPUT is an evaluation board based on uT-Engine
 	  specification.  This board has a OPSP-REP chip.
@@ -96,7 +89,6 @@ config PLAT_MAPPI3
 
 config PLAT_M32104UT
 	bool "M32104UT"
-	select PLAT_HAS_INT1ICU
 	help
 	  The M3T-M32104UT is an reference board based on uT-Engine
 	  specification.  This board has a M32104 chip.
@@ -157,18 +149,6 @@ config ISA_DUAL_ISSUE
 	depends on CHIP_M32700 || CHIP_OPSP
 	default y
 
-config PLAT_HAS_INT0ICU
-	bool
-	default n
-
-config PLAT_HAS_INT1ICU
-	bool
-	default n
-
-config PLAT_HAS_INT2ICU
-	bool
-	default n
-
 config BUS_CLOCK
 	int "Bus Clock [Hz] (integer)"
 	default "70000000" if PLAT_MAPPI

trunk/arch/m32r/Makefile

@@ -36,8 +36,7 @@ LIBGCC	:= $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 libs-y	+= arch/m32r/lib/ $(LIBGCC)
 core-y	+= arch/m32r/kernel/	\
 	   arch/m32r/mm/	\
-	   arch/m32r/boot/	\
-	   arch/m32r/platforms/
+	   arch/m32r/boot/
 
 drivers-$(CONFIG_OPROFILE)	+= arch/m32r/oprofile/