Patchwork powerpc/qe: Move cmxgcr_lock definition from the ucc.c into the qe.c

login
register
mail settings
Submitter Anton Vorontsov
Date Nov. 11, 2008, 3:31 p.m.
Message ID <20081111153139.GA10871@oksana.dev.rtsoft.ru>
Download mbox | patch
Permalink /patch/8154/
State Accepted
Commit 09a3fba8c132a55f153fd65fc1085b717a6193c8
Delegated to: Kumar Gala
Headers show

Comments

Anton Vorontsov - Nov. 11, 2008, 3:31 p.m.
With this patch we can compile the qe_lib/usb.c without the UCC
support (that is, without UCC_GETH and/or SERIAL_QE).

Fixes following link error (CONFIG_SMP should be =y to trigger this):

arch/powerpc/sysdev/built-in.o: In function `qe_usb_clock_set':
(.text+0x3cae): undefined reference to `cmxgcr_lock'
make: *** [.tmp_vmlinux1] Error 1

While at it, also add missing spinlock.h includes.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
---

This is for powerpc-next since nobody enables QE_USB yet.

 arch/powerpc/sysdev/qe_lib/qe.c  |    3 +++
 arch/powerpc/sysdev/qe_lib/ucc.c |    4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)
Timur Tabi - Nov. 11, 2008, 5:11 p.m.
On Tue, Nov 11, 2008 at 9:31 AM, Anton Vorontsov
<avorontsov@ru.mvista.com> wrote:
> With this patch we can compile the qe_lib/usb.c without the UCC
> support (that is, without UCC_GETH and/or SERIAL_QE).
>
> Fixes following link error (CONFIG_SMP should be =y to trigger this):
>
> arch/powerpc/sysdev/built-in.o: In function `qe_usb_clock_set':
> (.text+0x3cae): undefined reference to `cmxgcr_lock'
> make: *** [.tmp_vmlinux1] Error 1
>
> While at it, also add missing spinlock.h includes.
>
> Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>

Acked-By: Timur Tabi <timur@freescale.com>
Kumar Gala - Dec. 3, 2008, 3:50 p.m.
On Nov 11, 2008, at 9:31 AM, Anton Vorontsov wrote:

> With this patch we can compile the qe_lib/usb.c without the UCC
> support (that is, without UCC_GETH and/or SERIAL_QE).
>
> Fixes following link error (CONFIG_SMP should be =y to trigger this):
>
> arch/powerpc/sysdev/built-in.o: In function `qe_usb_clock_set':
> (.text+0x3cae): undefined reference to `cmxgcr_lock'
> make: *** [.tmp_vmlinux1] Error 1
>
> While at it, also add missing spinlock.h includes.
>
> Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
> ---
>
> This is for powerpc-next since nobody enables QE_USB yet.
>
> arch/powerpc/sysdev/qe_lib/qe.c  |    3 +++
> arch/powerpc/sysdev/qe_lib/ucc.c |    4 +---
> 2 files changed, 4 insertions(+), 3 deletions(-)

applied to next.

- k

Patch

diff --git a/arch/powerpc/sysdev/qe_lib/qe.c b/arch/powerpc/sysdev/qe_lib/qe.c
index b3b73ae..01bce37 100644
--- a/arch/powerpc/sysdev/qe_lib/qe.c
+++ b/arch/powerpc/sysdev/qe_lib/qe.c
@@ -19,6 +19,7 @@ 
 #include <linux/kernel.h>
 #include <linux/param.h>
 #include <linux/string.h>
+#include <linux/spinlock.h>
 #include <linux/mm.h>
 #include <linux/interrupt.h>
 #include <linux/bootmem.h>
@@ -38,6 +39,8 @@  static void qe_snums_init(void);
 static int qe_sdma_init(void);
 
 static DEFINE_SPINLOCK(qe_lock);
+DEFINE_SPINLOCK(cmxgcr_lock);
+EXPORT_SYMBOL(cmxgcr_lock);
 
 /* QE snum state */
 enum qe_snum_state {
diff --git a/arch/powerpc/sysdev/qe_lib/ucc.c b/arch/powerpc/sysdev/qe_lib/ucc.c
index 1d78071..ebb442e 100644
--- a/arch/powerpc/sysdev/qe_lib/ucc.c
+++ b/arch/powerpc/sysdev/qe_lib/ucc.c
@@ -18,6 +18,7 @@ 
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/stddef.h>
+#include <linux/spinlock.h>
 #include <linux/module.h>
 
 #include <asm/irq.h>
@@ -26,9 +27,6 @@ 
 #include <asm/qe.h>
 #include <asm/ucc.h>
 
-DEFINE_SPINLOCK(cmxgcr_lock);
-EXPORT_SYMBOL(cmxgcr_lock);
-
 int ucc_set_qe_mux_mii_mng(unsigned int ucc_num)
 {
 	unsigned long flags;