Commit 459e3953 authored Jul 29, 2020 by Herbert Xu Committed by Peter Zijlstra Jul 29, 2020

locking/qspinlock: Do not include atomic.h from qspinlock_types.h



This patch breaks a header loop involving qspinlock_types.h.
The issue is that qspinlock_types.h includes atomic.h, which then
eventually includes kernel.h which could lead back to the original
file via spinlock_types.h.

As ATOMIC_INIT is now defined by linux/types.h, there is no longer
any need to include atomic.h from qspinlock_types.h.  This also
allows the CONFIG_PARAVIRT hack to be removed since it was trying
to prevent exactly this loop.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Waiman Long <longman@redhat.com>
Link: https://lkml.kernel.org/r/20200729123316.GC7047@gondor.apana.org.au

parent 7ca8cf53

include/asm-generic/qspinlock.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@
		#define __ASM_GENERIC_QSPINLOCK_H

		#include <asm-generic/qspinlock_types.h>
		#include <linux/atomic.h>

		/**
		* queued_spin_is_locked - is the spinlock locked?

include/asm-generic/qspinlock_types.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -9,15 +9,7 @@
		#ifndef __ASM_GENERIC_QSPINLOCK_TYPES_H
		#define __ASM_GENERIC_QSPINLOCK_TYPES_H

		/*
		* Including atomic.h with PARAVIRT on will cause compilation errors because
		* of recursive header file incluson via paravirt_types.h. So don't include
		* it if PARAVIRT is on.
		*/
		#ifndef CONFIG_PARAVIRT
		#include <linux/types.h>
		#include <linux/atomic.h>
		#endif

		typedef struct qspinlock {
		union {

Admin message