ia64/xen-unstable

changeset 3037:1f69171df585

bitkeeper revision 1.1159.1.434 (419cb9a1Yh0c8r0esXLFKN8CAWPevA)

Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-unstable.bk
into arcadians.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xen.bk-smp
author cl349@arcadians.cl.cam.ac.uk
date Thu Nov 18 15:02:57 2004 +0000 (2004-11-18)
parents 812f69d3ddb2 e8a7fc6398af
children 20e04a8f1f86
files BitKeeper/etc/logging_ok linux-2.6.9-xen-sparse/drivers/char/tty_io.c linux-2.6.9-xen-sparse/include/asm-xen/foreign_page.h linux-2.6.9-xen-sparse/include/linux/gfp.h
line diff
     2.1 --- a/linux-2.6.9-xen-sparse/drivers/char/tty_io.c	Thu Nov 18 00:06:56 2004 +0000
     2.2 +++ b/linux-2.6.9-xen-sparse/drivers/char/tty_io.c	Thu Nov 18 15:02:57 2004 +0000
     2.3 @@ -1741,7 +1741,7 @@ retry_open:
     2.4  		goto got_driver;
     2.5  	}
     2.6  #ifdef CONFIG_VT
     2.7 -	if (console_use_vt && device == MKDEV(TTY_MAJOR,0)) {
     2.8 +	if (device == MKDEV(TTY_MAJOR,0)) {
     2.9  		extern int fg_console;
    2.10  		extern struct tty_driver *console_driver;
    2.11  		driver = console_driver;
    2.12 @@ -1961,7 +1961,7 @@ static int tiocswinsz(struct tty_struct 
    2.13  	if (!memcmp(&tmp_ws, &tty->winsize, sizeof(*arg)))
    2.14  		return 0;
    2.15  #ifdef CONFIG_VT
    2.16 -	if (console_use_vt && tty->driver->type == TTY_DRIVER_TYPE_CONSOLE) {
    2.17 +	if (tty->driver->type == TTY_DRIVER_TYPE_CONSOLE) {
    2.18  		unsigned int currcons = tty->index;
    2.19  		int rc;
    2.20  
     3.1 --- a/linux-2.6.9-xen-sparse/include/asm-xen/foreign_page.h	Thu Nov 18 00:06:56 2004 +0000
     3.2 +++ b/linux-2.6.9-xen-sparse/include/asm-xen/foreign_page.h	Thu Nov 18 15:02:57 2004 +0000
     3.3 @@ -10,10 +10,7 @@
     3.4  #ifndef __ASM_XEN_FOREIGN_PAGE_H__
     3.5  #define __ASM_XEN_FOREIGN_PAGE_H__
     3.6  
     3.7 -/*
     3.8 - * NOTE: PG_foreign must not conflict with any PG_ definition in page-flags.h!!
     3.9 - */
    3.10 -#define PG_foreign		25
    3.11 +#define PG_foreign		PG_arch_1
    3.12  
    3.13  #define PageForeign(page)	test_bit(PG_foreign, &(page)->flags)
    3.14  
     4.1 --- a/linux-2.6.9-xen-sparse/include/linux/gfp.h	Thu Nov 18 00:06:56 2004 +0000
     4.2 +++ b/linux-2.6.9-xen-sparse/include/linux/gfp.h	Thu Nov 18 15:02:57 2004 +0000
     4.3 @@ -79,11 +79,7 @@ struct vm_area_struct;
     4.4   * immediately bail: the arch-specific function has done all the work.
     4.5   */
     4.6  #ifndef HAVE_ARCH_FREE_PAGE
     4.7 -static inline int arch_free_page(struct page *page, int order)
     4.8 -{
     4.9 -	/* Generic free_page must do the work. */
    4.10 -	return 0;
    4.11 -}
    4.12 +#define arch_free_page(page, order) 0
    4.13  #endif
    4.14  
    4.15  extern struct page *