diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2016-12-16 05:05:38 +0100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-12-16 05:05:38 +0100 |
| commit | c6f6634721c871bfab4235e1cbcad208d3063798 (patch) | |
| tree | 9cc1d0307b9c5a3a84021419d5f80bea8bbfc49e /arch/powerpc/sysdev/fsl_lbc.c | |
| parent | powerpc/boot: Request no dynamic linker for boot wrapper (diff) | |
| parent | powerpc/fsl/dts: add FMan node for t1042d4rdb (diff) | |
| download | linux-c6f6634721c871bfab4235e1cbcad208d3063798.tar.xz linux-c6f6634721c871bfab4235e1cbcad208d3063798.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next
Freescale updates from Scott:
"Highlights include 8xx hugepage support, qbman fixes/cleanup, device
tree updates, and some misc cleanup."
Diffstat (limited to 'arch/powerpc/sysdev/fsl_lbc.c')
| -rw-r--r-- | arch/powerpc/sysdev/fsl_lbc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/fsl_lbc.c b/arch/powerpc/sysdev/fsl_lbc.c index 424b67fdb57f..5340a483cf55 100644 --- a/arch/powerpc/sysdev/fsl_lbc.c +++ b/arch/powerpc/sysdev/fsl_lbc.c @@ -31,7 +31,7 @@ #include <asm/prom.h> #include <asm/fsl_lbc.h> -static spinlock_t fsl_lbc_lock = __SPIN_LOCK_UNLOCKED(fsl_lbc_lock); +static DEFINE_SPINLOCK(fsl_lbc_lock); struct fsl_lbc_ctrl *fsl_lbc_ctrl_dev; EXPORT_SYMBOL(fsl_lbc_ctrl_dev); |