Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-3.4.63
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Pollinbox
linux-3.4.63
Commits
ae865023
Commit
ae865023
authored
Oct 01, 2013
by
Endres
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
final merge, ignoring the uImage
parent
a7ba3636
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
6 deletions
+7
-6
.gitignore
.gitignore
+1
-0
arch/mips/include/asm/sparsemem.h
arch/mips/include/asm/sparsemem.h
+1
-1
arch/mips/kernel/kprobes.c
arch/mips/kernel/kprobes.c
+1
-1
arch/mips/mm/tlb-r4k.c
arch/mips/mm/tlb-r4k.c
+4
-4
makeuImage
makeuImage
+0
-0
No files found.
.gitignore
View file @
ae865023
...
...
@@ -41,6 +41,7 @@ modules.builtin
/linux
/vmlinux
/vmlinuz
/uImage
/System.map
/Module.markers
/Module.symvers
...
...
arch/mips/include/asm/sparsemem.h
View file @
ae865023
...
...
@@ -9,7 +9,7 @@
#if defined(CONFIG_HUGETLB_PAGE) && defined(CONFIG_PAGE_SIZE_64KB)
# define SECTION_SIZE_BITS 29
#else
#
define SECTION_SIZE_BITS
28
#
define SECTION_SIZE_BITS
28
#endif
#define MAX_PHYSMEM_BITS 35
...
...
arch/mips/kernel/kprobes.c
View file @
ae865023
...
...
@@ -208,7 +208,7 @@ void __kprobes arch_disarm_kprobe(struct kprobe *p)
void
__kprobes
arch_remove_kprobe
(
struct
kprobe
*
p
)
{
if
(
p
->
ainsn
.
insn
)
{
free_insn_slot
(
p
->
ainsn
.
insn
,
0
);
free_insn_slot
(
p
->
ainsn
.
insn
,
0
);
p
->
ainsn
.
insn
=
NULL
;
}
}
...
...
arch/mips/mm/tlb-r4k.c
View file @
ae865023
...
...
@@ -122,9 +122,9 @@ void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
unsigned
long
size
,
flags
;
ENTER_CRITICAL
(
flags
);
start
=
round_down
(
start
,
PAGE_SIZE
<<
1
);
end
=
round_up
(
end
,
PAGE_SIZE
<<
1
);
size
=
(
end
-
start
)
>>
(
PAGE_SHIFT
+
1
);
start
=
round_down
(
start
,
PAGE_SIZE
<<
1
);
end
=
round_up
(
end
,
PAGE_SIZE
<<
1
);
size
=
(
end
-
start
)
>>
(
PAGE_SHIFT
+
1
);
if
(
size
<=
current_cpu_data
.
tlbsize
/
2
)
{
int
oldpid
=
read_c0_entryhi
();
int
newpid
=
cpu_asid
(
cpu
,
mm
);
...
...
@@ -133,7 +133,7 @@ void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
int
idx
;
write_c0_entryhi
(
start
|
newpid
);
start
+=
(
PAGE_SIZE
<<
1
);
start
+=
(
PAGE_SIZE
<<
1
);
mtc0_tlbw_hazard
();
tlb_probe
();
tlb_probe_hazard
();
...
...
makeuImage
100644 → 100755
View file @
ae865023
File mode changed from 100644 to 100755
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