From: Paul Burton <paul.burton@imgtec.com>
To: <linux-mips@linux-mips.org>, Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <james.hogan@imgtec.com>,
Paul Burton <paul.burton@imgtec.com>,
"Maciej W. Rozycki" <macro@linux-mips.org>,
<linux-kernel@vger.kernel.org>, Jonas Gorski <jogo@openwrt.org>,
"Markos Chandras" <markos.chandras@imgtec.com>,
Alex Smith <alex.smith@imgtec.com>,
"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Subject: [PATCH v2 03/13] MIPS: Remove redundant asm/pgtable-bits.h inclusions
Date: Mon, 18 Apr 2016 10:35:23 +0100 [thread overview]
Message-ID: <1460972133-16973-4-git-send-email-paul.burton@imgtec.com> (raw)
In-Reply-To: <1460972133-16973-1-git-send-email-paul.burton@imgtec.com>
asm/pgtable-bits.h is included in 2 assembly files and thus has to
in either of the assembly files that include it.
Remove the redundant inclusions such that asm/pgtable-bits.h doesn't
need to #ifdef around C code, for cleanliness & and in preparation for
later patches which will add more C.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Reviewed-by: James Hogan <james.hogan@imgtec.com>
---
Changes in v2:
- Fixup commit message that was missing a line.
arch/mips/include/asm/pgtable-bits.h | 2 --
arch/mips/kernel/head.S | 1 -
arch/mips/kernel/r4k_switch.S | 1 -
3 files changed, 4 deletions(-)
diff --git a/arch/mips/include/asm/pgtable-bits.h b/arch/mips/include/asm/pgtable-bits.h
index 97b3138..2f40312 100644
--- a/arch/mips/include/asm/pgtable-bits.h
+++ b/arch/mips/include/asm/pgtable-bits.h
@@ -191,7 +191,6 @@
*/
-#ifndef __ASSEMBLY__
/*
* pte_to_entrylo converts a page table entry (PTE) into a Mips
* entrylo0/1 value.
@@ -218,7 +217,6 @@ static inline uint64_t pte_to_entrylo(unsigned long pte_val)
return pte_val >> _PAGE_GLOBAL_SHIFT;
}
-#endif
/*
* Cache attributes
diff --git a/arch/mips/kernel/head.S b/arch/mips/kernel/head.S
index 4e4cc5b..b8fb0ba 100644
--- a/arch/mips/kernel/head.S
+++ b/arch/mips/kernel/head.S
@@ -21,7 +21,6 @@
#include <asm/asmmacro.h>
#include <asm/irqflags.h>
#include <asm/regdef.h>
-#include <asm/pgtable-bits.h>
#include <asm/mipsregs.h>
#include <asm/stackframe.h>
diff --git a/arch/mips/kernel/r4k_switch.S b/arch/mips/kernel/r4k_switch.S
index 92cd051..2f0a3b2 100644
--- a/arch/mips/kernel/r4k_switch.S
+++ b/arch/mips/kernel/r4k_switch.S
@@ -15,7 +15,6 @@
#include <asm/fpregdef.h>
#include <asm/mipsregs.h>
#include <asm/asm-offsets.h>
-#include <asm/pgtable-bits.h>
#include <asm/regdef.h>
#include <asm/stackframe.h>
#include <asm/thread_info.h>
--
2.8.0
next prev parent reply other threads:[~2016-04-18 9:36 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1460972133-16973-1-git-send-email-paul.burton@imgtec.com>
2016-04-18 9:35 ` [PATCH v2 01/13] MIPS: Separate XPA CPU feature into LPA and MVH Paul Burton
2016-04-18 9:35 ` [PATCH v2 02/13] MIPS: Fix HTW config on XPA kernel without LPA enabled Paul Burton
2016-04-18 9:35 ` Paul Burton [this message]
2016-04-18 12:36 ` [PATCH v2 03/13] MIPS: Remove redundant asm/pgtable-bits.h inclusions Sergei Shtylyov
2016-04-18 9:35 ` [PATCH v2 04/13] MIPS: Use enums to make asm/pgtable-bits.h readable Paul Burton
2016-04-18 9:35 ` [PATCH v2 06/13] MIPS: mm: Unify pte_page definition Paul Burton
2016-04-18 9:35 ` [PATCH v2 08/13] MIPS: mm: Don't clobber $1 on XPA TLB refill Paul Burton
2016-04-18 9:35 ` [PATCH v2 09/13] MIPS: mm: Pass scratch register through to iPTE_SW Paul Burton
2016-04-18 9:35 ` [PATCH v2 10/13] MIPS: mm: Be more explicit about PTE mode bit handling Paul Burton
2016-04-18 9:35 ` [PATCH v2 11/13] MIPS: mm: Simplify build_update_entries Paul Burton
2016-04-18 9:35 ` [PATCH v2 12/13] MIPS: mm: Don't do MTHC0 if XPA not present Paul Burton
2016-04-18 9:35 ` [PATCH v2 13/13] MIPS: mm: Panic if an XPA kernel is run without RIXI Paul Burton
2016-04-18 10:04 ` James Hogan
[not found] ` <1460972133-16973-8-git-send-email-paul.burton@imgtec.com>
2016-04-18 14:34 ` [PATCH v2 07/13] MIPS: mm: Fix MIPS32 36b physical addressing (alchemy, netlogic) Manuel Lauss
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1460972133-16973-4-git-send-email-paul.burton@imgtec.com \
--to=paul.burton@imgtec.com \
--cc=alex.smith@imgtec.com \
--cc=james.hogan@imgtec.com \
--cc=jogo@openwrt.org \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=macro@linux-mips.org \
--cc=markos.chandras@imgtec.com \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®