summaryrefslogtreecommitdiffstats
path: root/kernel/arch/um
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/arch/um')
-rw-r--r--kernel/arch/um/drivers/mconsole_kern.c2
-rw-r--r--kernel/arch/um/include/asm/common.lds.S2
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/arch/um/drivers/mconsole_kern.c b/kernel/arch/um/drivers/mconsole_kern.c
index 29880c9b3..e22e57298 100644
--- a/kernel/arch/um/drivers/mconsole_kern.c
+++ b/kernel/arch/um/drivers/mconsole_kern.c
@@ -133,7 +133,7 @@ void mconsole_proc(struct mc_request *req)
ptr += strlen("proc");
ptr = skip_spaces(ptr);
- file = file_open_root(mnt->mnt_root, mnt, ptr, O_RDONLY);
+ file = file_open_root(mnt->mnt_root, mnt, ptr, O_RDONLY, 0);
if (IS_ERR(file)) {
mconsole_reply(req, "Failed to open file", 1, 0);
printk(KERN_ERR "open /proc/%s: %ld\n", ptr, PTR_ERR(file));
diff --git a/kernel/arch/um/include/asm/common.lds.S b/kernel/arch/um/include/asm/common.lds.S
index 1dd5bd8a8..133055311 100644
--- a/kernel/arch/um/include/asm/common.lds.S
+++ b/kernel/arch/um/include/asm/common.lds.S
@@ -81,7 +81,7 @@
.altinstr_replacement : { *(.altinstr_replacement) }
/* .exit.text is discard at runtime, not link time, to deal with references
from .altinstructions and .eh_frame */
- .exit.text : { *(.exit.text) }
+ .exit.text : { EXIT_TEXT }
.exit.data : { *(.exit.data) }
.preinit_array : {