Move __delay function into assembly to get accurate BogoMips

Author: popcornmix

arch/arm/mach-bcm2708/Makefile

@@ -2,7 +2,7 @@
 # Makefile for the linux kernel.
 #
 
-obj-$(CONFIG_MACH_BCM2708) 	+= clock.o bcm2708.o armctrl.o vcio.o power.o dma.o
+obj-$(CONFIG_MACH_BCM2708) 	+= clock.o bcm2708.o armctrl.o vcio.o power.o dma.o delay.o
 obj-$(CONFIG_BCM2708_GPIO)	+= bcm2708_gpio.o
 obj-$(CONFIG_BCM2708_VCMEM)	+= vc_mem.o
 

arch/arm/mach-bcm2708/bcm2708.c

@@ -883,12 +883,6 @@ void __const_udelay(unsigned long scaled_usecs)
 	} while ((long)(now - start) <= usecs);
 }
 
-void __delay(int loops)
-{
-	while (--loops > 0)
-		nop();
-}
-
 MACHINE_START(BCM2708, "BCM2708")
     /* Maintainer: Broadcom Europe Ltd. */
     .map_io = bcm2708_map_io,.init_irq = bcm2708_init_irq,.timer =

arch/arm/mach-bcm2708/delay.S

@@ -0,0 +1,20 @@
+/*
+ *  linux/arch/arm/lib/delay.S
+ *
+ *  Copyright (C) 1995, 1996 Russell King
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include <linux/linkage.h>
+#include <asm/assembler.h>
+#include <asm/param.h>
+
+		.text
+@ Delay routine
+ENTRY(__delay)
+		subs	r0, r0, #1
+		bhi	__delay
+		mov	pc, lr
+ENDPROC(__delay)