Merge tag ‘omap-for-v3.9-rc6/fixes-signed’ of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes [Linux 3.9]

This Linux kernel change "Merge tag ‘omap-for-v3.9-rc6/fixes-signed’ of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes" is included in the Linux 3.9 release. This change is authored by Olof Johansson <olof [at] lixom.net> on Fri Apr 26 17:35:13 2013 -0700. The commit for this change in Linux stable tree is d21be23 (patch). Other info about this change: Merge: 73053d9 f4d7a53

Merge tag 'omap-for-v3.9-rc6/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

From Tony Lindgren:
One MUSB regression fix that I forgot to send earlier. Without
this MUSB no longer works on omap4 based devices.

* tag 'omap-for-v3.9-rc6/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP4: hwmod data: make 'ocp2scp_usb_phy_phy_48m" as the main clock

Signed-off-by: Olof Johansson <[email protected]>

There is no are 0 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 arch/arm/mach-highbank/hotplug.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-highbank/hotplug.c b/arch/arm/mach-highbank/hotplug.c
index f30c528..890cae2 100644
--- a/arch/arm/mach-highbank/hotplug.c
+++ b/arch/arm/mach-highbank/hotplug.c
@@ -28,13 +28,11 @@
  */
 void __ref highbank_cpu_die(unsigned int cpu)
 {
-   flush_cache_all();
-
    highbank_set_cpu_jump(cpu, phys_to_virt(0));
-   highbank_set_core_pwr();

-   cpu_do_idle();
+   flush_cache_louis();
+   highbank_set_core_pwr();

-   /* We should never return from idle */
-   panic("highbank: cpu %d unexpectedly exit from shutdownn", cpu);
+   while (1)
+       cpu_do_idle();
 }

Leave a Reply

Your email address will not be published. Required fields are marked *