diff options
Diffstat (limited to 'arch/mn10300/kernel')
| -rw-r--r-- | arch/mn10300/kernel/mn10300-serial.c | 5 | ||||
| -rw-r--r-- | arch/mn10300/kernel/process.c | 6 | ||||
| -rw-r--r-- | arch/mn10300/kernel/rtc.c | 5 |
3 files changed, 4 insertions, 12 deletions
diff --git a/arch/mn10300/kernel/mn10300-serial.c b/arch/mn10300/kernel/mn10300-serial.c index ef34d5a0f8b..9d49073e827 100644 --- a/arch/mn10300/kernel/mn10300-serial.c +++ b/arch/mn10300/kernel/mn10300-serial.c @@ -44,11 +44,6 @@ static const char serial_revdate[] = "2007-11-06"; #include <unit/timex.h> #include "mn10300-serial.h" -static inline __attribute__((format(printf, 1, 2))) -void no_printk(const char *fmt, ...) -{ -} - #define kenter(FMT, ...) \ printk(KERN_DEBUG "-->%s(" FMT ")\n", __func__, ##__VA_ARGS__) #define _enter(FMT, ...) \ diff --git a/arch/mn10300/kernel/process.c b/arch/mn10300/kernel/process.c index 82b817c7f7b..f48373e2bc1 100644 --- a/arch/mn10300/kernel/process.c +++ b/arch/mn10300/kernel/process.c @@ -268,9 +268,9 @@ asmlinkage long sys_vfork(void) 0, NULL, NULL); } -asmlinkage long sys_execve(char __user *name, - char __user * __user *argv, - char __user * __user *envp) +asmlinkage long sys_execve(const char __user *name, + const char __user *const __user *argv, + const char __user *const __user *envp) { char *filename; int error; diff --git a/arch/mn10300/kernel/rtc.c b/arch/mn10300/kernel/rtc.c index 815a933aafa..4eef0e7224f 100644 --- a/arch/mn10300/kernel/rtc.c +++ b/arch/mn10300/kernel/rtc.c @@ -20,9 +20,6 @@ DEFINE_SPINLOCK(rtc_lock); EXPORT_SYMBOL(rtc_lock); -/* last time the RTC got updated */ -static long last_rtc_update; - /* time for RTC to update itself in ioclks */ static unsigned long mn10300_rtc_update_period; @@ -110,7 +107,7 @@ static int set_rtc_mmss(unsigned long nowtime) int update_persistent_clock(struct timespec now) { - return set_rtc_mms(now.tv_sec); + return set_rtc_mmss(now.tv_sec); } /* |