projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
generic: mtd backport for Spansion S25FL164K
[openwrt/openwrt.git]
/
target
/
linux
/
generic
/
patches-4.0
/
305-mips_module_reloc.patch
diff --git
a/target/linux/generic/patches-4.0/305-mips_module_reloc.patch
b/target/linux/generic/patches-4.0/305-mips_module_reloc.patch
index 2e92916f97039b49aabf33764e8bb3d3421b534a..87c205c7db7a452ed049ada10dd8be19cc3b5459 100644
(file)
--- a/
target/linux/generic/patches-4.0/305-mips_module_reloc.patch
+++ b/
target/linux/generic/patches-4.0/305-mips_module_reloc.patch
@@
-3,7
+3,7
@@
@@ -90,8 +90,13 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin
cflags-y += -G 0 -mno-abicalls -fno-pic -pipe -mno-branch-likely
cflags-y += -msoft-float
@@ -90,8 +90,13 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin
cflags-y += -G 0 -mno-abicalls -fno-pic -pipe -mno-branch-likely
cflags-y += -msoft-float
- LDFLAGS_vmlinux += -G 0 -static -n -nostdlib --gc-sections
--sort-section=name
+ LDFLAGS_vmlinux += -G 0 -static -n -nostdlib --gc-sections
+ifdef CONFIG_64BIT
KBUILD_AFLAGS_MODULE += -mlong-calls
KBUILD_CFLAGS_MODULE += -mlong-calls
+ifdef CONFIG_64BIT
KBUILD_AFLAGS_MODULE += -mlong-calls
KBUILD_CFLAGS_MODULE += -mlong-calls
@@
-30,7
+30,7
@@
typedef uint8_t Elf64_Byte; /* Type for a 8-bit quantity. */
--- a/arch/mips/kernel/module.c
+++ b/arch/mips/kernel/module.c
typedef uint8_t Elf64_Byte; /* Type for a 8-bit quantity. */
--- a/arch/mips/kernel/module.c
+++ b/arch/mips/kernel/module.c
-@@ -43,14 +43,22
2
@@ struct mips_hi16 {
+@@ -43,14 +43,22
1
@@ struct mips_hi16 {
static LIST_HEAD(dbe_list);
static DEFINE_SPINLOCK(dbe_lock);
static LIST_HEAD(dbe_list);
static DEFINE_SPINLOCK(dbe_lock);
@@
-126,6
+126,10
@@
+
+ split_page(page, order);
+
+
+ split_page(page, order);
+
++ /* mark all pages except for the last one */
++ for (p = page; p + 1 < page + (size >> PAGE_SHIFT); ++p)
++ set_bit(PG_owner_priv_1, &p->flags);
++
+ for (p = page + (size >> PAGE_SHIFT); p < page + (1 << order); ++p)
+ __free_page(p);
+
+ for (p = page + (size >> PAGE_SHIFT); p < page + (1 << order); ++p)
+ __free_page(p);
+
@@
-133,16
+137,17
@@
+}
+#endif
+
+}
+#endif
+
-+static void free_phys(void *ptr
, unsigned long size
)
++static void free_phys(void *ptr)
+{
+ struct page *page;
+{
+ struct page *page;
-+
struct page *end
;
++
bool free
;
+
+ page = virt_to_page(ptr);
+
+ page = virt_to_page(ptr);
-+ end = page + (PAGE_ALIGN(size) >> PAGE_SHIFT);
-+
-+ for (; page < end; ++page)
++ do {
++ free = test_and_clear_bit(PG_owner_priv_1, &page->flags);
+ __free_page(page);
+ __free_page(page);
++ page++;
++ } while (free);
+}
+
+
+}
+
+
@@
-150,7
+155,7
@@
{
+#ifdef MODULE_START
return __vmalloc_node_range(size, 1, MODULE_START, MODULE_END,
{
+#ifdef MODULE_START
return __vmalloc_node_range(size, 1, MODULE_START, MODULE_END,
- GFP_KERNEL, PAGE_KERNEL, NUMA_NO_NODE,
+ GFP_KERNEL, PAGE_KERNEL,
0,
NUMA_NO_NODE,
__builtin_return_address(0));
+#else
+ void *ptr;
__builtin_return_address(0));
+#else
+ void *ptr;
@@
-180,18
+185,12
@@
+}
+
+/* Free memory returned from module_alloc */
+}
+
+/* Free memory returned from module_alloc */
-+void module_
free(struct module *mod,
void *module_region)
++void module_
memfree(
void *module_region)
+{
+{
-+ if (is_phys_addr(module_region)) {
-+ if (mod->module_init == module_region)
-+ free_phys(module_region, mod->init_size);
-+ else if (mod->module_core == module_region)
-+ free_phys(module_region, mod->core_size);
-+ else
-+ BUG();
-+ } else {
++ if (is_phys_addr(module_region))
++ free_phys(module_region);
++ else
+ vfree(module_region);
+ vfree(module_region);
-+ }
+}
+
+static void *__module_alloc(int size, bool phys)
+}
+
+static void *__module_alloc(int size, bool phys)
@@
-254,7
+253,7
@@
int apply_r_mips_none(struct module *me, u32 *location, Elf_Addr v)
{
int apply_r_mips_none(struct module *me, u32 *location, Elf_Addr v)
{
-@@ -64,8 +27
2
,39 @@ static int apply_r_mips_32_rel(struct mo
+@@ -64,8 +27
1
,39 @@ static int apply_r_mips_32_rel(struct mo
return 0;
}
return 0;
}
@@
-294,7
+293,7
@@
if (v % 4) {
pr_err("module %s: dangerous R_MIPS_26 REL relocation\n",
me->name);
if (v % 4) {
pr_err("module %s: dangerous R_MIPS_26 REL relocation\n",
me->name);
-@@ -73,14 +31
2
,17 @@ static int apply_r_mips_26_rel(struct mo
+@@ -73,14 +31
1
,17 @@ static int apply_r_mips_26_rel(struct mo
}
if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
}
if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
@@
-317,7
+316,7
@@
return 0;
}
return 0;
}
-@@ -287,11 +52
9
,32 @@ int module_finalize(const Elf_Ehdr *hdr,
+@@ -287,11 +52
8
,32 @@ int module_finalize(const Elf_Ehdr *hdr,
list_add(&me->arch.dbe_list, &dbe_list);
spin_unlock_irq(&dbe_lock);
}
list_add(&me->arch.dbe_list, &dbe_list);
spin_unlock_irq(&dbe_lock);
}