---

yaml
---
r: 57791
b: refs/heads/master
c: db94d9d
h: refs/heads/master
i:
  57789: 3379358
  57787: fe1d93c
  57783: 4544540
  57775: cc763bc
  57759: 327de45
  57727: c06840c
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e871e3c268a26c35ad805196a01d84a55bb755c6
+refs/heads/master: db94d9d24526f83c432f0e5620078f02f7ae76ca

trunk/arch/arm/mach-s3c2440/mach-anubis.c

@@ -76,8 +76,8 @@ static struct map_desc anubis_iodesc[] __initdata = {
 	.length		= SZ_4K,
 	.type		= MT_DEVICE,
   }, {
-	.virtual	= (u32)ANUBIS_VA_IDREG,
-	.pfn		= __phys_to_pfn(ANUBIS_PA_IDREG),
+	.virtual	= (u32)ANUBIS_VA_CTRL2,
+	.pfn		= __phys_to_pfn(ANUBIS_PA_CTRL2),
 	.length		= SZ_4K,
 	.type		= MT_DEVICE,
   },

trunk/arch/arm/mach-s3c2440/mach-osiris.c

@@ -16,7 +16,6 @@
 #include <linux/timer.h>
 #include <linux/init.h>
 #include <linux/device.h>
-#include <linux/sysdev.h>
 #include <linux/serial_core.h>
 
 #include <asm/mach/arch.h>
@@ -66,11 +65,6 @@ static struct map_desc osiris_iodesc[] __initdata = {
   /* CPLD control registers */
 
   {
-	  .virtual	= (u32)OSIRIS_VA_CTRL0,
-	  .pfn		= __phys_to_pfn(OSIRIS_PA_CTRL0),
-	  .length	= SZ_16K,
-	  .type		= MT_DEVICE,
-  }, {
 	  .virtual	= (u32)OSIRIS_VA_CTRL1,
 	  .pfn		= __phys_to_pfn(OSIRIS_PA_CTRL1),
 	  .length	= SZ_16K,
@@ -80,11 +74,6 @@ static struct map_desc osiris_iodesc[] __initdata = {
 	  .pfn		= __phys_to_pfn(OSIRIS_PA_CTRL2),
 	  .length	= SZ_16K,
 	  .type		= MT_DEVICE,
-  }, {
-	  .virtual	= (u32)OSIRIS_VA_IDREG,
-	  .pfn		= __phys_to_pfn(OSIRIS_PA_IDREG),
-	  .length	= SZ_16K,
-	  .type		= MT_DEVICE,
   },
 };
 
@@ -206,13 +195,13 @@ static void osiris_nand_select(struct s3c2410_nand_set *set, int slot)
 	pr_debug("osiris_nand: selecting slot %d (set %p,%p)\n",
 		 slot, set, set->nr_map);
 
-	tmp = __raw_readb(OSIRIS_VA_CTRL0);
-	tmp &= ~OSIRIS_CTRL0_NANDSEL;
+	tmp = __raw_readb(OSIRIS_VA_CTRL1);
+	tmp &= ~OSIRIS_CTRL1_NANDSEL;
 	tmp |= slot;
 
-	pr_debug("osiris_nand: ctrl0 now %02x\n", tmp);
+	pr_debug("osiris_nand: ctrl1 now %02x\n", tmp);
 
-	__raw_writeb(tmp, OSIRIS_VA_CTRL0);
+	__raw_writeb(tmp, OSIRIS_VA_CTRL1);
 }
 
 static struct s3c2410_platform_nand osiris_nand_info = {
@@ -246,45 +235,10 @@ static struct platform_device osiris_pcmcia = {
 	.resource	= osiris_pcmcia_resource,
 };
 
-/* Osiris power management device */
-
-#ifdef CONFIG_PM
-static unsigned char pm_osiris_ctrl0;
-
-static int osiris_pm_suspend(struct sys_device *sd, pm_message_t state)
-{
-	pm_osiris_ctrl0 = __raw_readb(OSIRIS_VA_CTRL0);
-	return 0;
-}
-
-static int osiris_pm_resume(struct sys_device *sd)
-{
-	if (pm_osiris_ctrl0 & OSIRIS_CTRL0_FIX8)
-		__raw_writeb(OSIRIS_CTRL1_FIX8, OSIRIS_VA_CTRL1);
-
-	return 0;
-}
-
-#else
-#define osiris_pm_suspend NULL
-#define osiris_pm_resume NULL
-#endif
-
-static struct sysdev_class osiris_pm_sysclass = {
-	set_kset_name("mach-osiris"),
-	.suspend	= osiris_pm_suspend,
-	.resume		= osiris_pm_resume,
-};
-
-static struct sys_device osiris_pm_sysdev = {
-	.cls		= &osiris_pm_sysclass,
-};
-
 /* Standard Osiris devices */
 
 static struct platform_device *osiris_devices[] __initdata = {
 	&s3c_device_i2c,
-	&s3c_device_wdt,
 	&s3c_device_nand,
 	&osiris_pcmcia,
 };
@@ -334,9 +288,6 @@ static void __init osiris_map_io(void)
 
 static void __init osiris_init(void)
 {
-	sysdev_class_register(&osiris_pm_sysclass);
-	sysdev_register(&osiris_pm_sysdev);
-
 	platform_add_devices(osiris_devices, ARRAY_SIZE(osiris_devices));
 };
 
@@ -348,6 +299,5 @@ MACHINE_START(OSIRIS, "Simtec-OSIRIS")
 	.map_io		= osiris_map_io,
 	.init_machine	= osiris_init,
 	.init_irq	= s3c24xx_init_irq,
-	.init_machine	= osiris_init,
 	.timer		= &s3c24xx_timer,
 MACHINE_END

trunk/arch/arm/vfp/entry.S

@@ -29,10 +29,6 @@ do_vfp:
 	add	r10, r10, #TI_VFPSTATE	@ r10 = workspace
 	ldr	pc, [r4]		@ call VFP entry point
 
-ENTRY(vfp_null_entry)
-	mov	pc, lr
-ENDPROC(vfp_null_entry)
-
 .LCvfp:
 	.word	vfp_vector
 

trunk/arch/arm/vfp/vfpmodule.c

@@ -26,9 +26,8 @@
  */
 void vfp_testing_entry(void);
 void vfp_support_entry(void);
-void vfp_null_entry(void);
 
-void (*vfp_vector)(void) = vfp_null_entry;
+void (*vfp_vector)(void) = vfp_testing_entry;
 union vfp_state *last_VFP_context[NR_CPUS];
 
 /*
@@ -322,10 +321,8 @@ static int __init vfp_init(void)
 	 * The handler is already setup to just log calls, so
 	 * we just need to read the VFPSID register.
 	 */
-	vfp_vector = vfp_testing_entry;
 	vfpsid = fmrx(FPSID);
 	barrier();
-	vfp_vector = vfp_null_entry;
 
 	printk(KERN_INFO "VFP support v0.3: ");
 	if (VFP_arch) {

trunk/arch/avr32/boards/atstk1000/atstk1002.c

@@ -42,7 +42,6 @@ static struct spi_board_info spi0_board_info[] __initdata = {
 		.modalias	= "ltv350qv",
 		.max_speed_hz	= 16000000,
 		.chip_select	= 1,
-		.mode		= SPI_MODE_3,
 	},
 };
 

trunk/arch/avr32/mm/fault.c

@@ -158,7 +158,7 @@ asmlinkage void do_page_fault(unsigned long ecr, struct pt_regs *regs)
 	up_read(&mm->mmap_sem);
 
 	if (user_mode(regs)) {
-		if (exception_trace && printk_ratelimit())
+		if (exception_trace)
 			printk("%s%s[%d]: segfault at %08lx pc %08lx "
 			       "sp %08lx ecr %lu\n",
 			       is_init(tsk) ? KERN_EMERG : KERN_INFO,