Title: [7416] trunk/arch/blackfin: include asm/cdef_misc.h to asm/blackfin.h, and add a lost local_irq_save_hw()
- Revision
- 7416
- Author
- gyang
- Date
- 2009-09-23 00:27:04 -0400 (Wed, 23 Sep 2009)
Log Message
include asm/cdef_misc.h to asm/blackfin.h, and add a lost local_irq_save_hw()
Modified Paths
Diff
Modified: trunk/arch/blackfin/include/asm/blackfin.h (7415 => 7416)
--- trunk/arch/blackfin/include/asm/blackfin.h 2009-09-23 03:55:12 UTC (rev 7415)
+++ trunk/arch/blackfin/include/asm/blackfin.h 2009-09-23 04:27:04 UTC (rev 7416)
@@ -89,5 +89,6 @@
#include <asm/mem_map.h>
#include <mach/blackfin.h>
#include <asm/bfin-global.h>
+#include <asm/cdef_misc.h>
#endif /* _BLACKFIN_H_ */
Modified: trunk/arch/blackfin/include/asm/cdef_misc.h (7415 => 7416)
--- trunk/arch/blackfin/include/asm/cdef_misc.h 2009-09-23 03:55:12 UTC (rev 7415)
+++ trunk/arch/blackfin/include/asm/cdef_misc.h 2009-09-23 04:27:04 UTC (rev 7416)
@@ -31,6 +31,7 @@
#ifndef _CDEF_MISC_H
#define _CDEF_MISC_H
+#ifndef __ASSEMBLY__
#include <asm/irq.h>
/* Writing to PLL_CTL initiates a PLL relock sequence. */
static __inline__ void bfin_write_PLL_CTL(unsigned int val)
@@ -106,6 +107,7 @@
if (val == bfin_read_VR_CTL())
return;
+ local_irq_save_hw(flags);
/* Enable the PLL Wakeup bit in SIC IWR */
#ifdef SIC_IWR0
iwr0 = bfin_read32(SIC_IWR0);
@@ -190,3 +192,4 @@
#endif
#endif
+#endif
Modified: trunk/arch/blackfin/mach-bf533/boards/stamp.c (7415 => 7416)
--- trunk/arch/blackfin/mach-bf533/boards/stamp.c 2009-09-23 03:55:12 UTC (rev 7415)
+++ trunk/arch/blackfin/mach-bf533/boards/stamp.c 2009-09-23 04:27:04 UTC (rev 7416)
@@ -46,7 +46,6 @@
#include <asm/reboot.h>
#include <asm/portmux.h>
#include <asm/dpmc.h>
-#include <asm/cdef_misc.h>
/*
* Name the Board for the /proc/cpuinfo
Modified: trunk/arch/blackfin/mach-common/dpmc.c (7415 => 7416)
--- trunk/arch/blackfin/mach-common/dpmc.c 2009-09-23 03:55:12 UTC (rev 7415)
+++ trunk/arch/blackfin/mach-common/dpmc.c 2009-09-23 04:27:04 UTC (rev 7416)
@@ -16,7 +16,6 @@
#include <asm/delay.h>
#include <asm/dpmc.h>
-#include <asm/cdef_misc.h>
#define DRIVER_NAME "bfin dpmc"
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
