Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
07d17f09
Commit
07d17f09
authored
Jan 24, 2016
by
Ralf Baechle
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '4.4-fixes' into mips-for-linux-next
parents
dbb98314
2549cc96
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
14 additions
and
4 deletions
+14
-4
arch/mips/include/asm/io.h
arch/mips/include/asm/io.h
+1
-0
arch/mips/include/asm/mips-cm.h
arch/mips/include/asm/mips-cm.h
+4
-0
arch/mips/include/asm/page.h
arch/mips/include/asm/page.h
+1
-1
arch/mips/kernel/setup.c
arch/mips/kernel/setup.c
+1
-1
arch/mips/kernel/smp-cps.c
arch/mips/kernel/smp-cps.c
+3
-0
arch/mips/vdso/Makefile
arch/mips/vdso/Makefile
+1
-1
scripts/ld-version.sh
scripts/ld-version.sh
+3
-1
No files found.
arch/mips/include/asm/io.h
View file @
07d17f09
...
@@ -275,6 +275,7 @@ static inline void __iomem * __ioremap_mode(phys_addr_t offset, unsigned long si
...
@@ -275,6 +275,7 @@ static inline void __iomem * __ioremap_mode(phys_addr_t offset, unsigned long si
*/
*/
#define ioremap_cachable(offset, size) \
#define ioremap_cachable(offset, size) \
__ioremap_mode((offset), (size), _page_cachable_default)
__ioremap_mode((offset), (size), _page_cachable_default)
#define ioremap_cache ioremap_cachable
/*
/*
* These two are MIPS specific ioremap variant. ioremap_cacheable_cow
* These two are MIPS specific ioremap variant. ioremap_cacheable_cow
...
...
arch/mips/include/asm/mips-cm.h
View file @
07d17f09
...
@@ -243,6 +243,10 @@ BUILD_CM_Cx_R_(tcid_8_priority, 0x80)
...
@@ -243,6 +243,10 @@ BUILD_CM_Cx_R_(tcid_8_priority, 0x80)
#define CM_GCR_BASE_CMDEFTGT_IOCU0 2
#define CM_GCR_BASE_CMDEFTGT_IOCU0 2
#define CM_GCR_BASE_CMDEFTGT_IOCU1 3
#define CM_GCR_BASE_CMDEFTGT_IOCU1 3
/* GCR_RESET_EXT_BASE register fields */
#define CM_GCR_RESET_EXT_BASE_EVARESET BIT(31)
#define CM_GCR_RESET_EXT_BASE_UEB BIT(30)
/* GCR_ACCESS register fields */
/* GCR_ACCESS register fields */
#define CM_GCR_ACCESS_ACCESSEN_SHF 0
#define CM_GCR_ACCESS_ACCESSEN_SHF 0
#define CM_GCR_ACCESS_ACCESSEN_MSK (_ULCAST_(0xff) << 0)
#define CM_GCR_ACCESS_ACCESSEN_MSK (_ULCAST_(0xff) << 0)
...
...
arch/mips/include/asm/page.h
View file @
07d17f09
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
#define PAGE_SHIFT 16
#define PAGE_SHIFT 16
#endif
#endif
#define PAGE_SIZE (_AC(1,UL) << PAGE_SHIFT)
#define PAGE_SIZE (_AC(1,UL) << PAGE_SHIFT)
#define PAGE_MASK (~(
PAGE_SIZE
- 1))
#define PAGE_MASK (~(
(1 << PAGE_SHIFT)
- 1))
/*
/*
* This is used for calculating the real page sizes
* This is used for calculating the real page sizes
...
...
arch/mips/kernel/setup.c
View file @
07d17f09
...
@@ -623,7 +623,7 @@ static void __init request_crashkernel(struct resource *res)
...
@@ -623,7 +623,7 @@ static void __init request_crashkernel(struct resource *res)
#define USE_PROM_CMDLINE IS_ENABLED(CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER)
#define USE_PROM_CMDLINE IS_ENABLED(CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER)
#define USE_DTB_CMDLINE IS_ENABLED(CONFIG_MIPS_CMDLINE_FROM_DTB)
#define USE_DTB_CMDLINE IS_ENABLED(CONFIG_MIPS_CMDLINE_FROM_DTB)
#define EXTEND_WITH_PROM IS_ENABLED(CONFIG_MIPS_CMDLINE_EXTEND)
#define EXTEND_WITH_PROM IS_ENABLED(CONFIG_MIPS_CMDLINE_
DTB_
EXTEND)
static
void
__init
arch_mem_init
(
char
**
cmdline_p
)
static
void
__init
arch_mem_init
(
char
**
cmdline_p
)
{
{
...
...
arch/mips/kernel/smp-cps.c
View file @
07d17f09
...
@@ -202,6 +202,9 @@ static void boot_core(unsigned core)
...
@@ -202,6 +202,9 @@ static void boot_core(unsigned core)
/* Ensure its coherency is disabled */
/* Ensure its coherency is disabled */
write_gcr_co_coherence
(
0
);
write_gcr_co_coherence
(
0
);
/* Start it with the legacy memory map and exception base */
write_gcr_co_reset_ext_base
(
CM_GCR_RESET_EXT_BASE_UEB
);
/* Ensure the core can access the GCRs */
/* Ensure the core can access the GCRs */
access
=
read_gcr_access
();
access
=
read_gcr_access
();
access
|=
1
<<
(
CM_GCR_ACCESS_ACCESSEN_SHF
+
core
);
access
|=
1
<<
(
CM_GCR_ACCESS_ACCESSEN_SHF
+
core
);
...
...
arch/mips/vdso/Makefile
View file @
07d17f09
...
@@ -26,7 +26,7 @@ aflags-vdso := $(ccflags-vdso) \
...
@@ -26,7 +26,7 @@ aflags-vdso := $(ccflags-vdso) \
# the comments on that file.
# the comments on that file.
#
#
ifndef
CONFIG_CPU_MIPSR6
ifndef
CONFIG_CPU_MIPSR6
ifeq
($(call ld-ifversion, -lt, 22500000, y),y)
ifeq
($(call ld-ifversion, -lt, 22500000
0
, y),y)
$(warning
MIPS
VDSO
requires
binutils
>=
2.25)
$(warning
MIPS
VDSO
requires
binutils
>=
2.25)
obj-vdso-y
:=
$(
filter-out
gettimeofday.o,
$
(
obj-vdso-y
))
obj-vdso-y
:=
$(
filter-out
gettimeofday.o,
$
(
obj-vdso-y
))
ccflags-vdso
+=
-DDISABLE_MIPS_VDSO
ccflags-vdso
+=
-DDISABLE_MIPS_VDSO
...
...
scripts/ld-version.sh
View file @
07d17f09
...
@@ -2,7 +2,9 @@
...
@@ -2,7 +2,9 @@
# extract linker version number from stdin and turn into single number
# extract linker version number from stdin and turn into single number
{
{
gsub
(
".*)"
,
""
)
;
gsub
(
".*)"
,
""
)
;
gsub
(
".*version "
,
""
)
;
gsub
(
"-.*"
,
""
)
;
split
(
$1
,a,
"."
)
;
split
(
$1
,a,
"."
)
;
print a[1]
*
10000000
+ a[2]
*
1
00000 + a[3]
*
10000 + a[4]
*
100 + a[5]
;
print a[1]
*
10000000
0 + a[2]
*
10
00000 + a[3]
*
10000 + a[4]
*
100 + a[5]
;
exit
exit
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment