Commit 525a1a51 authored by Jeff Dike's avatar Jeff Dike

Fixed a few problems in the last merge.

parent 77074c5d
...@@ -23,9 +23,6 @@ obj-$(CONFIG_MODE_SKAS) += skas/ ...@@ -23,9 +23,6 @@ obj-$(CONFIG_MODE_SKAS) += skas/
user-objs-$(CONFIG_TTY_LOG) += tty_log.o user-objs-$(CONFIG_TTY_LOG) += tty_log.o
# user_syms.o not included here because Rules.make has its own ideas about
# building anything in export-objs
USER_OBJS := $(filter %_user.o,$(obj-y)) $(user-objs-y) config.o helper.o \ USER_OBJS := $(filter %_user.o,$(obj-y)) $(user-objs-y) config.o helper.o \
process.o tempfile.o time.o tty_log.o umid.o user_util.o user_syms.o process.o tempfile.o time.o tty_log.o umid.o user_util.o user_syms.o
USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file)) USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))
...@@ -47,7 +44,7 @@ CFLAGS_user_syms.o = -D__AUTOCONF_INCLUDED__ $(DMODULES-y) $(DMODVERSIONS-y) \ ...@@ -47,7 +44,7 @@ CFLAGS_user_syms.o = -D__AUTOCONF_INCLUDED__ $(DMODULES-y) $(DMODVERSIONS-y) \
CFLAGS_frame.o := $(patsubst -fomit-frame-pointer,,$(USER_CFLAGS)) CFLAGS_frame.o := $(patsubst -fomit-frame-pointer,,$(USER_CFLAGS))
$(USER_OBJS) : %.o: %.c $(USER_OBJS) : %.o: %.c
$(CC) $(CFLAGS_$@) $(USER_CFLAGS) -c -o $@ $< $(CC) $(CFLAGS_$(notdir $@)) $(USER_CFLAGS) -c -o $@ $<
$(obj)/unmap.o: $(src)/unmap.c $(obj)/unmap.o: $(src)/unmap.c
$(CC) $(UNMAP_CFLAGS) -c -o $@ $< $(CC) $(UNMAP_CFLAGS) -c -o $@ $<
......
...@@ -435,7 +435,7 @@ struct page *arch_validate(struct page *page, int mask, int order) ...@@ -435,7 +435,7 @@ struct page *arch_validate(struct page *page, int mask, int order)
addr += PAGE_SIZE; addr += PAGE_SIZE;
} }
if(i == (1 << order)) return(page); if(i == (1 << order)) return(page);
page = _alloc_pages(mask, order); page = alloc_pages(mask, order);
goto again; goto again;
} }
......
...@@ -44,7 +44,7 @@ void user_signal(int sig, union uml_pt_regs *regs) ...@@ -44,7 +44,7 @@ void user_signal(int sig, union uml_pt_regs *regs)
if(sig == SIGVTALRM) if(sig == SIGVTALRM)
missed_ticks[cpu()]++; missed_ticks[cpu()]++;
regs->skas.is_user = 1; regs->skas.is_user = 1;
regs->fault_addr = 0; regs->skas.fault_addr = 0;
regs->skas.fault_type = 0; regs->skas.fault_type = 0;
regs->skas.trap_type = 0; regs->skas.trap_type = 0;
info = &sig_info[sig]; info = &sig_info[sig];
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include "linux/sched.h" #include "linux/sched.h"
#include "linux/signal.h" #include "linux/signal.h"
#include "linux/kernel.h" #include "linux/kernel.h"
#include "linux/interrupt.h"
#include "asm/system.h" #include "asm/system.h"
#include "asm/pgalloc.h" #include "asm/pgalloc.h"
#include "asm/ptrace.h" #include "asm/ptrace.h"
......
...@@ -10,10 +10,7 @@ ...@@ -10,10 +10,7 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include "user_util.h" #include "user_util.h"
#include "mem_user.h" #include "mem_user.h"
#include "uml-config.h"
/* XXX All the __CONFIG_* stuff is broken because this file can't include
* config.h
*/
/* Had to steal this from linux/module.h because that file can't be included /* Had to steal this from linux/module.h because that file can't be included
* since this includes various user-level headers. * since this includes various user-level headers.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment