git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
[pandora-kernel.git]
/
arch
/
mips
/
kernel
/
binfmt_elfn32.c
diff --git
a/arch/mips/kernel/binfmt_elfn32.c
b/arch/mips/kernel/binfmt_elfn32.c
index
4a9f1ec
..
9fdd8bc
100644
(file)
--- a/
arch/mips/kernel/binfmt_elfn32.c
+++ b/
arch/mips/kernel/binfmt_elfn32.c
@@
-54,6
+54,7
@@
typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
#include <linux/module.h>
#include <linux/elfcore.h>
#include <linux/compat.h>
#include <linux/module.h>
#include <linux/elfcore.h>
#include <linux/compat.h>
+#include <linux/math64.h>
#define elf_prstatus elf_prstatus32
struct elf_prstatus32
#define elf_prstatus elf_prstatus32
struct elf_prstatus32
@@
-90,7
+91,6
@@
struct elf_prpsinfo32
char pr_psargs[ELF_PRARGSZ]; /* initial part of arg list */
};
char pr_psargs[ELF_PRARGSZ]; /* initial part of arg list */
};
-#define elf_addr_t u32
#define elf_caddr_t u32
#define init_elf_binfmt init_elfn32_binfmt
#define elf_caddr_t u32
#define init_elf_binfmt init_elfn32_binfmt
@@
-99,12
+99,12
@@
static __inline__ void
jiffies_to_compat_timeval(unsigned long jiffies, struct compat_timeval *value)
{
/*
jiffies_to_compat_timeval(unsigned long jiffies, struct compat_timeval *value)
{
/*
- * Convert jiffies to nanoseconds and sep
e
rate with
+ * Convert jiffies to nanoseconds and sep
a
rate with
* one divide.
*/
u64 nsec = (u64)jiffies * TICK_NSEC;
* one divide.
*/
u64 nsec = (u64)jiffies * TICK_NSEC;
-
long
rem;
- value->tv_sec = div_
long_long
_rem(nsec, NSEC_PER_SEC, &rem);
+
u32
rem;
+ value->tv_sec = div_
u64
_rem(nsec, NSEC_PER_SEC, &rem);
value->tv_usec = rem / NSEC_PER_USEC;
}
value->tv_usec = rem / NSEC_PER_USEC;
}