Signed-off-by: Paolo 'Blaisorblade' Giarrusso --- um-linux-2.4.27-paolo/arch/um/Makefile | 14 +++++++++++--- um-linux-2.4.27-paolo/arch/um/drivers/hostaudio_kern.c | 2 +- um-linux-2.4.27-paolo/arch/um/kernel/process_kern.c | 1 + um-linux-2.4.27-paolo/arch/um/kernel/tty_log.c | 2 ++ um-linux-2.4.27-paolo/arch/um/kernel/umid.c | 3 ++- um-linux-2.4.27-paolo/drivers/char/n_tty.c | 14 ++++++++------ 6 files changed, 25 insertions(+), 11 deletions(-) diff -puN arch/um/drivers/hostaudio_kern.c~mini-changes-4 arch/um/drivers/hostaudio_kern.c --- um-linux-2.4.27/arch/um/drivers/hostaudio_kern.c~mini-changes-4 2005-04-15 11:12:55.000000000 +0200 +++ um-linux-2.4.27-paolo/arch/um/drivers/hostaudio_kern.c 2005-04-15 11:12:55.000000000 +0200 @@ -35,7 +35,7 @@ char *mixer = HOSTAUDIO_DEV_MIXER; " The default is \"" HOSTAUDIO_DEV_DSP "\".\n\n" #define MIXER_HELP \ -" This is used to specify the host mixer device to the hostaudio driver.\n" \ +" This is used to specify the host mixer device to the hostaudio driver.\n"\ " The default is \"" HOSTAUDIO_DEV_MIXER "\".\n\n" #ifndef MODULE diff -puN arch/um/kernel/process_kern.c~mini-changes-4 arch/um/kernel/process_kern.c --- um-linux-2.4.27/arch/um/kernel/process_kern.c~mini-changes-4 2005-04-15 11:12:55.000000000 +0200 +++ um-linux-2.4.27-paolo/arch/um/kernel/process_kern.c 2005-04-15 11:12:55.000000000 +0200 @@ -162,6 +162,7 @@ int copy_thread(int nr, unsigned long cl struct pt_regs *regs) { p->thread = (struct thread_struct) INIT_THREAD; + /* XXX Kernel stack size assumption */ p->thread.kernel_stack = (unsigned long) p + 2 * PAGE_SIZE; return(CHOOSE_MODE_PROC(copy_thread_tt, copy_thread_skas, nr, diff -puN arch/um/kernel/tty_log.c~mini-changes-4 arch/um/kernel/tty_log.c --- um-linux-2.4.27/arch/um/kernel/tty_log.c~mini-changes-4 2005-04-15 11:12:55.000000000 +0200 +++ um-linux-2.4.27-paolo/arch/um/kernel/tty_log.c 2005-04-15 11:12:55.000000000 +0200 @@ -205,6 +205,8 @@ static int __init set_tty_log_fd(char *n printf("set_tty_log_fd - strtoul failed on '%s'\n", name); tty_log_fd = -1; } + + *add = 0; return 0; } diff -puN arch/um/kernel/umid.c~mini-changes-4 arch/um/kernel/umid.c --- um-linux-2.4.27/arch/um/kernel/umid.c~mini-changes-4 2005-04-15 11:12:55.000000000 +0200 +++ um-linux-2.4.27-paolo/arch/um/kernel/umid.c 2005-04-15 11:12:55.000000000 +0200 @@ -43,7 +43,7 @@ static int __init set_umid(char *name, i } if(strlen(name) > UMID_LEN - 1) - (*printer)("Unique machine name is being truncated to %s " + (*printer)("Unique machine name is being truncated to %d " "characters\n", UMID_LEN); strncpy(umid, name, UMID_LEN - 1); umid[UMID_LEN - 1] = '\0'; @@ -55,6 +55,7 @@ static int __init set_umid(char *name, i static int __init set_umid_arg(char *name, int *add) { + *add = 0; return(set_umid(name, 0, printf)); } diff -puN drivers/char/n_tty.c~mini-changes-4 drivers/char/n_tty.c --- um-linux-2.4.27/drivers/char/n_tty.c~mini-changes-4 2005-04-15 11:12:55.000000000 +0200 +++ um-linux-2.4.27-paolo/drivers/char/n_tty.c 2005-04-15 11:12:55.000000000 +0200 @@ -25,9 +25,11 @@ * who actually finally proved there really was a race. * * 2002/03/18 Implemented n_tty_wakeup to send SIGIO POLL_OUTs to - * waiting writing processes-Sapan Bhatia . - * Also fixed a bug in BLOCKING mode where write_chan returns - * EAGAIN + * waiting writing processes-Sapan Bhatia + * + * 2002/03/19 Fixed write_chan to stay put if console driver returns + * EAGAIN and not return since it returns an EAGAIN in a + * non-blocking operation-Sapan Bhatia */ #include @@ -1177,9 +1179,9 @@ static ssize_t write_chan(struct tty_str if (O_OPOST(tty) && !(test_bit(TTY_HW_COOK_OUT, &tty->flags))) { while (nr > 0) { ssize_t num = opost_block(tty, b, nr); - if (num < 0) { - if (num == -EAGAIN) - break; + if (num < 0){ + if(num == -EAGAIN) + break; retval = num; goto break_out; } diff -puN arch/um/Makefile~mini-changes-4 arch/um/Makefile --- um-linux-2.4.27/arch/um/Makefile~mini-changes-4 2005-04-15 11:12:55.000000000 +0200 +++ um-linux-2.4.27-paolo/arch/um/Makefile 2005-04-15 11:12:55.000000000 +0200 @@ -25,7 +25,7 @@ ifneq ($(MAKEFILE-y),) include $(addprefix $(ARCH_DIR)/,$(MAKEFILE-y)) endif -EXTRAVERSION := $(EXTRAVERSION)-1um +EXTRAVERSION := $(EXTRAVERSION)-2um include/linux/version.h: arch/$(ARCH)/Makefile @@ -65,7 +65,7 @@ LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wra # included; the values here are meaningless CONFIG_NEST_LEVEL ?= 0 -CONFIG_KERNEL_HALF_GIGS ?= 0 +CONFIG_KERNEL_HALF_GIGS ?= 0 SIZE = (($(CONFIG_NEST_LEVEL) + $(CONFIG_KERNEL_HALF_GIGS)) * 0x20000000) @@ -128,7 +128,9 @@ USER_CFLAGS := $(patsubst -D__KERNEL__,, USER_CFLAGS += -D_GNU_SOURCE CLEAN_FILES += linux x.i gmon.out $(ARCH_DIR)/link.ld $(ARCH_DIR)/dyn_link.ld \ - $(GEN_HEADERS) $(ARCH_DIR)/include/uml-config.h + $(GEN_HEADERS) +# $(ARCH_DIR)/include/uml-config.h removed temporarily because this causes +# make to fail after make clean $(ARCH_DIR)/main.o: $(ARCH_DIR)/main.c $(CC) $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< @@ -176,3 +178,9 @@ $(ARCH_DIR)/util/mk_constants : $(ARCH_D $(MAKE) $(MFLAGS) -C $(ARCH_DIR)/util mk_constants export SUBARCH USER_CFLAGS OS + +all: linux + +define archhelp + echo '* linux - Binary kernel image (./linux)' +endef _