projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'jk/vfs' into work.misc
[cascardo/linux.git]
/
arch
/
mips
/
include
/
asm
/
page.h
diff --git
a/arch/mips/include/asm/page.h
b/arch/mips/include/asm/page.h
index
ea0cd97
..
5f98759
100644
(file)
--- a/
arch/mips/include/asm/page.h
+++ b/
arch/mips/include/asm/page.h
@@
-164,7
+164,7
@@
typedef struct { unsigned long pgprot; } pgprot_t;
*/
static inline unsigned long ___pa(unsigned long x)
{
*/
static inline unsigned long ___pa(unsigned long x)
{
- if (
config_enabled
(CONFIG_64BIT)) {
+ if (
IS_ENABLED
(CONFIG_64BIT)) {
/*
* For MIPS64 the virtual address may either be in one of
* the compatibility segements ckseg0 or ckseg1, or it may
/*
* For MIPS64 the virtual address may either be in one of
* the compatibility segements ckseg0 or ckseg1, or it may
@@
-173,7
+173,7
@@
static inline unsigned long ___pa(unsigned long x)
return x < CKSEG0 ? XPHYSADDR(x) : CPHYSADDR(x);
}
return x < CKSEG0 ? XPHYSADDR(x) : CPHYSADDR(x);
}
- if (!
config_enabled
(CONFIG_EVA)) {
+ if (!
IS_ENABLED
(CONFIG_EVA)) {
/*
* We're using the standard MIPS32 legacy memory map, ie.
* the address x is going to be in kseg0 or kseg1. We can
/*
* We're using the standard MIPS32 legacy memory map, ie.
* the address x is going to be in kseg0 or kseg1. We can