Commit ae865023 authored by Endres's avatar Endres

final merge, ignoring the uImage

parent a7ba3636
...@@ -41,6 +41,7 @@ modules.builtin ...@@ -41,6 +41,7 @@ modules.builtin
/linux /linux
/vmlinux /vmlinux
/vmlinuz /vmlinuz
/uImage
/System.map /System.map
/Module.markers /Module.markers
/Module.symvers /Module.symvers
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#if defined(CONFIG_HUGETLB_PAGE) && defined(CONFIG_PAGE_SIZE_64KB) #if defined(CONFIG_HUGETLB_PAGE) && defined(CONFIG_PAGE_SIZE_64KB)
# define SECTION_SIZE_BITS 29 # define SECTION_SIZE_BITS 29
#else #else
#define SECTION_SIZE_BITS 28 # define SECTION_SIZE_BITS 28
#endif #endif
#define MAX_PHYSMEM_BITS 35 #define MAX_PHYSMEM_BITS 35
......
...@@ -208,7 +208,7 @@ void __kprobes arch_disarm_kprobe(struct kprobe *p) ...@@ -208,7 +208,7 @@ void __kprobes arch_disarm_kprobe(struct kprobe *p)
void __kprobes arch_remove_kprobe(struct kprobe *p) void __kprobes arch_remove_kprobe(struct kprobe *p)
{ {
if (p->ainsn.insn) { if (p->ainsn.insn) {
free_insn_slot(p->ainsn.insn, 0); free_insn_slot(p->ainsn.insn, 0);
p->ainsn.insn = NULL; p->ainsn.insn = NULL;
} }
} }
......
...@@ -122,9 +122,9 @@ void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start, ...@@ -122,9 +122,9 @@ void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
unsigned long size, flags; unsigned long size, flags;
ENTER_CRITICAL(flags); ENTER_CRITICAL(flags);
start = round_down(start, PAGE_SIZE << 1); start = round_down(start, PAGE_SIZE << 1);
end = round_up(end, PAGE_SIZE << 1); end = round_up(end, PAGE_SIZE << 1);
size = (end - start) >> (PAGE_SHIFT + 1); size = (end - start) >> (PAGE_SHIFT + 1);
if (size <= current_cpu_data.tlbsize/2) { if (size <= current_cpu_data.tlbsize/2) {
int oldpid = read_c0_entryhi(); int oldpid = read_c0_entryhi();
int newpid = cpu_asid(cpu, mm); int newpid = cpu_asid(cpu, mm);
...@@ -133,7 +133,7 @@ void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start, ...@@ -133,7 +133,7 @@ void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
int idx; int idx;
write_c0_entryhi(start | newpid); write_c0_entryhi(start | newpid);
start += (PAGE_SIZE << 1); start += (PAGE_SIZE << 1);
mtc0_tlbw_hazard(); mtc0_tlbw_hazard();
tlb_probe(); tlb_probe();
tlb_probe_hazard(); tlb_probe_hazard();
......
File mode changed from 100644 to 100755
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment