mirror of https://github.com/schoebel/mars
115 lines
3.4 KiB
Diff
115 lines
3.4 KiB
Diff
From 36cde2b2d526bf86a74a38737a9d9ad7cf31adfd Mon Sep 17 00:00:00 2001
|
|
From: Thomas Schoebel-Theuer <schoebel@bell.site>
|
|
Date: Wed, 26 Jun 2013 14:45:07 +0200
|
|
Subject: [PATCH] mars: generic pre-patch for mars
|
|
|
|
Mostly introduces missing EXPORT_SYMBOL().
|
|
Should have exactly zero impact onto the kernel.
|
|
|
|
This is the generic version which exports all sys_*() system
|
|
calls. This should not introduce any additional maintenance pain
|
|
because that interfaces has to be stable anyway due to POSIX etc.
|
|
|
|
Conflicts:
|
|
include/linux/syscalls.h
|
|
---
|
|
fs/open.c | 1 -
|
|
fs/utimes.c | 2 ++
|
|
include/linux/syscalls.h | 3 +++
|
|
include/uapi/linux/major.h | 1 +
|
|
mm/page_alloc.c | 2 ++
|
|
5 files changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/fs/open.c b/fs/open.c
|
|
index 86092bd..5c6a36a 100644
|
|
--- a/fs/open.c
|
|
+++ b/fs/open.c
|
|
@@ -1015,7 +1015,6 @@ SYSCALL_DEFINE1(close, unsigned int, fd)
|
|
|
|
return retval;
|
|
}
|
|
-EXPORT_SYMBOL(sys_close);
|
|
|
|
/*
|
|
* This routine simulates a hangup on the tty, to arrange that users
|
|
diff --git a/fs/utimes.c b/fs/utimes.c
|
|
index f4fb7ec..6afbba8 100644
|
|
--- a/fs/utimes.c
|
|
+++ b/fs/utimes.c
|
|
@@ -1,3 +1,4 @@
|
|
+#include <linux/module.h>
|
|
#include <linux/compiler.h>
|
|
#include <linux/file.h>
|
|
#include <linux/fs.h>
|
|
@@ -174,6 +175,7 @@ retry:
|
|
out:
|
|
return error;
|
|
}
|
|
+EXPORT_SYMBOL(do_utimes);
|
|
|
|
SYSCALL_DEFINE4(utimensat, int, dfd, const char __user *, filename,
|
|
struct timespec __user *, utimes, int, flags)
|
|
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
|
|
index 84662ec..a48d94f 100644
|
|
--- a/include/linux/syscalls.h
|
|
+++ b/include/linux/syscalls.h
|
|
@@ -74,6 +74,7 @@ struct sigaltstack;
|
|
#include <linux/sem.h>
|
|
#include <asm/siginfo.h>
|
|
#include <linux/unistd.h>
|
|
+#include <linux/export.h>
|
|
#include <linux/quota.h>
|
|
#include <linux/key.h>
|
|
#include <trace/syscall.h>
|
|
@@ -169,6 +170,7 @@ extern struct trace_event_functions exit_syscall_print_funcs;
|
|
|
|
#define SYSCALL_DEFINE0(sname) \
|
|
SYSCALL_METADATA(_##sname, 0); \
|
|
+ EXPORT_SYMBOL(sys_##sname); \
|
|
asmlinkage long sys_##sname(void)
|
|
|
|
#define SYSCALL_DEFINE1(name, ...) SYSCALL_DEFINEx(1, _##name, __VA_ARGS__)
|
|
@@ -194,6 +196,7 @@ extern struct trace_event_functions exit_syscall_print_funcs;
|
|
return ret; \
|
|
} \
|
|
SYSCALL_ALIAS(sys##name, SyS##name); \
|
|
+ EXPORT_SYMBOL(sys##name); \
|
|
static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__))
|
|
|
|
asmlinkage long sys_time(time_t __user *tloc);
|
|
diff --git a/include/uapi/linux/major.h b/include/uapi/linux/major.h
|
|
index 6a8ca98..faf6692 100644
|
|
--- a/include/uapi/linux/major.h
|
|
+++ b/include/uapi/linux/major.h
|
|
@@ -146,6 +146,7 @@
|
|
#define UNIX98_PTY_SLAVE_MAJOR (UNIX98_PTY_MASTER_MAJOR+UNIX98_PTY_MAJOR_COUNT)
|
|
|
|
#define DRBD_MAJOR 147
|
|
+#define MARS_MAJOR 148
|
|
#define RTF_MAJOR 150
|
|
#define RAW_MAJOR 162
|
|
|
|
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
|
|
index 0ab02fb..edbd1c4 100644
|
|
--- a/mm/page_alloc.c
|
|
+++ b/mm/page_alloc.c
|
|
@@ -197,6 +197,7 @@ static char * const zone_names[MAX_NR_ZONES] = {
|
|
};
|
|
|
|
int min_free_kbytes = 1024;
|
|
+EXPORT_SYMBOL(min_free_kbytes);
|
|
|
|
static unsigned long __meminitdata nr_kernel_pages;
|
|
static unsigned long __meminitdata nr_all_pages;
|
|
@@ -5371,6 +5372,7 @@ static void __setup_per_zone_wmarks(void)
|
|
/* update totalreserve_pages */
|
|
calculate_totalreserve_pages();
|
|
}
|
|
+EXPORT_SYMBOL(setup_per_zone_wmarks);
|
|
|
|
/**
|
|
* setup_per_zone_wmarks - called when min_free_kbytes changes
|
|
--
|
|
1.9.3
|
|
|