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 master.kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
[pandora-kernel.git]
/
arch
/
ia64
/
ia32
/
binfmt_elf32.c
diff --git
a/arch/ia64/ia32/binfmt_elf32.c
b/arch/ia64/ia32/binfmt_elf32.c
index
a7280d9
..
578737e
100644
(file)
--- a/
arch/ia64/ia32/binfmt_elf32.c
+++ b/
arch/ia64/ia32/binfmt_elf32.c
@@
-9,7
+9,6
@@
* 04/13/01 D. Mosberger dropped saving tssd in ar.k1---it's not needed
* 09/14/01 D. Mosberger fixed memory management for gdt/tss page
*/
* 04/13/01 D. Mosberger dropped saving tssd in ar.k1---it's not needed
* 09/14/01 D. Mosberger fixed memory management for gdt/tss page
*/
-#include <linux/config.h>
#include <linux/types.h>
#include <linux/mm.h>
#include <linux/types.h>
#include <linux/mm.h>
@@
-35,6
+34,9
@@
extern void ia64_elf32_init (struct pt_regs *regs);
static void elf32_set_personality (void);
static void elf32_set_personality (void);
+static unsigned long __attribute ((unused))
+randomize_stack_top(unsigned long stack_top);
+
#define setup_arg_pages(bprm,tos,exec) ia32_setup_arg_pages(bprm,exec)
#define elf_map elf32_map
#define setup_arg_pages(bprm,tos,exec) ia32_setup_arg_pages(bprm,exec)
#define elf_map elf32_map
@@
-89,7
+91,7
@@
ia64_elf32_init (struct pt_regs *regs)
* it with privilege level 3 because the IVE uses non-privileged accesses to these
* tables. IA-32 segmentation is used to protect against IA-32 accesses to them.
*/
* it with privilege level 3 because the IVE uses non-privileged accesses to these
* tables. IA-32 segmentation is used to protect against IA-32 accesses to them.
*/
- vma = kmem_cache_alloc(vm_area_cachep,
SLAB
_KERNEL);
+ vma = kmem_cache_alloc(vm_area_cachep,
GFP
_KERNEL);
if (vma) {
memset(vma, 0, sizeof(*vma));
vma->vm_mm = current->mm;
if (vma) {
memset(vma, 0, sizeof(*vma));
vma->vm_mm = current->mm;
@@
-115,7
+117,7
@@
ia64_elf32_init (struct pt_regs *regs)
* code is locked in specific gate page, which is pointed by pretcode
* when setup_frame_ia32
*/
* code is locked in specific gate page, which is pointed by pretcode
* when setup_frame_ia32
*/
- vma = kmem_cache_alloc(vm_area_cachep,
SLAB
_KERNEL);
+ vma = kmem_cache_alloc(vm_area_cachep,
GFP
_KERNEL);
if (vma) {
memset(vma, 0, sizeof(*vma));
vma->vm_mm = current->mm;
if (vma) {
memset(vma, 0, sizeof(*vma));
vma->vm_mm = current->mm;
@@
-140,7
+142,7
@@
ia64_elf32_init (struct pt_regs *regs)
* Install LDT as anonymous memory. This gives us all-zero segment descriptors
* until a task modifies them via modify_ldt().
*/
* Install LDT as anonymous memory. This gives us all-zero segment descriptors
* until a task modifies them via modify_ldt().
*/
- vma = kmem_cache_alloc(vm_area_cachep,
SLAB
_KERNEL);
+ vma = kmem_cache_alloc(vm_area_cachep,
GFP
_KERNEL);
if (vma) {
memset(vma, 0, sizeof(*vma));
vma->vm_mm = current->mm;
if (vma) {
memset(vma, 0, sizeof(*vma));
vma->vm_mm = current->mm;
@@
-212,7
+214,7
@@
ia32_setup_arg_pages (struct linux_binprm *bprm, int executable_stack)
bprm->loader += stack_base;
bprm->exec += stack_base;
bprm->loader += stack_base;
bprm->exec += stack_base;
- mpnt = kmem_cache_alloc(vm_area_cachep,
SLAB
_KERNEL);
+ mpnt = kmem_cache_alloc(vm_area_cachep,
GFP
_KERNEL);
if (!mpnt)
return -ENOMEM;
if (!mpnt)
return -ENOMEM;
@@
-261,8
+263,6
@@
elf32_set_personality (void)
{
set_personality(PER_LINUX32);
current->thread.map_base = IA32_PAGE_OFFSET/3;
{
set_personality(PER_LINUX32);
current->thread.map_base = IA32_PAGE_OFFSET/3;
- current->thread.task_size = IA32_PAGE_OFFSET; /* use what Linux/x86 uses... */
- set_fs(USER_DS); /* set addr limit for new TASK_SIZE */
}
static unsigned long
}
static unsigned long