mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-11-04 04:50:17 +00:00
40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
Date: Fri, 8 Jan 2021 19:48:21 +0100
|
|
Subject: [PATCH] powerpc: Avoid recursive header includes
|
|
|
|
- The include of bug.h leads to an include of printk.h which gets back
|
|
to spinlock.h and complains then about missing xchg().
|
|
Remove bug.h and add bits.h which is needed for BITS_PER_BYTE.
|
|
|
|
- Avoid the "please don't include this file directly" error from
|
|
rwlock-rt. Allow an include from/with rtmutex.h.
|
|
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
---
|
|
arch/powerpc/include/asm/cmpxchg.h | 2 +-
|
|
arch/powerpc/include/asm/simple_spinlock_types.h | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/arch/powerpc/include/asm/cmpxchg.h
|
|
+++ b/arch/powerpc/include/asm/cmpxchg.h
|
|
@@ -5,7 +5,7 @@
|
|
#ifdef __KERNEL__
|
|
#include <linux/compiler.h>
|
|
#include <asm/synch.h>
|
|
-#include <linux/bug.h>
|
|
+#include <linux/bits.h>
|
|
|
|
#ifdef __BIG_ENDIAN
|
|
#define BITOFF_CAL(size, off) ((sizeof(u32) - size - off) * BITS_PER_BYTE)
|
|
--- a/arch/powerpc/include/asm/simple_spinlock_types.h
|
|
+++ b/arch/powerpc/include/asm/simple_spinlock_types.h
|
|
@@ -2,7 +2,7 @@
|
|
#ifndef _ASM_POWERPC_SIMPLE_SPINLOCK_TYPES_H
|
|
#define _ASM_POWERPC_SIMPLE_SPINLOCK_TYPES_H
|
|
|
|
-#ifndef __LINUX_SPINLOCK_TYPES_H
|
|
+#if !defined(__LINUX_SPINLOCK_TYPES_H) && !defined(__LINUX_RT_MUTEX_H)
|
|
# error "please don't include this file directly"
|
|
#endif
|
|
|