ia64/linux-2.6.18-xen.hg

changeset 441:30993af85114

merge with linux-2.6.18-xen.hg
author Alex Williamson <alex.williamson@hp.com>
date Tue Feb 26 10:12:31 2008 -0700 (2008-02-26)
parents 99478ffd81ee 1edfea26a2a9
children 0c1e6a1b8e90
files
line diff
     1.1 --- a/drivers/xen/fbfront/xenkbd.c	Fri Feb 22 08:36:10 2008 -0700
     1.2 +++ b/drivers/xen/fbfront/xenkbd.c	Tue Feb 26 10:12:31 2008 -0700
     1.3 @@ -64,13 +64,11 @@ static irqreturn_t input_handler(int rq,
     1.4  		dev = info->ptr;
     1.5  		switch (event->type) {
     1.6  		case XENKBD_TYPE_MOTION:
     1.7 -			if ( event->motion.rel_z == 1 || event->motion.rel_z == -1 ) {
     1.8 -				input_report_rel(dev, REL_WHEEL, 0 - event->motion.rel_z);
     1.9 -			}           
    1.10 -			else {
    1.11 -				input_report_rel(dev, REL_X, event->motion.rel_x);
    1.12 -				input_report_rel(dev, REL_Y, event->motion.rel_y);
    1.13 -			}
    1.14 +			if (event->motion.rel_z)
    1.15 +				input_report_rel(dev, REL_WHEEL,
    1.16 +						 0 - event->motion.rel_z);
    1.17 +			input_report_rel(dev, REL_X, event->motion.rel_x);
    1.18 +			input_report_rel(dev, REL_Y, event->motion.rel_y);
    1.19  			break;
    1.20  		case XENKBD_TYPE_KEY:
    1.21  			dev = NULL;
    1.22 @@ -86,13 +84,11 @@ static irqreturn_t input_handler(int rq,
    1.23  				       event->key.keycode);
    1.24  			break;
    1.25  		case XENKBD_TYPE_POS:
    1.26 -			if ( event->pos.abs_z == 1 || event->pos.abs_z == -1 ) {
    1.27 -				input_report_rel(dev, REL_WHEEL, 0 - event->pos.abs_z);
    1.28 -			}
    1.29 -			else {
    1.30 -				input_report_abs(dev, ABS_X, event->pos.abs_x);
    1.31 -				input_report_abs(dev, ABS_Y, event->pos.abs_y);
    1.32 -			}
    1.33 +			if (event->pos.abs_z)
    1.34 +				input_report_rel(dev, REL_WHEEL,
    1.35 +						 0 - event->pos.abs_z);
    1.36 +			input_report_abs(dev, ABS_X, event->pos.abs_x);
    1.37 +			input_report_abs(dev, ABS_Y, event->pos.abs_y);
    1.38  			break;
    1.39  		}
    1.40  		if (dev)
     2.1 --- a/include/xen/blkif.h	Fri Feb 22 08:36:10 2008 -0700
     2.2 +++ b/include/xen/blkif.h	Tue Feb 26 10:12:31 2008 -0700
     2.3 @@ -1,3 +1,23 @@
     2.4 +/* 
     2.5 + * Permission is hereby granted, free of charge, to any person obtaining a copy
     2.6 + * of this software and associated documentation files (the "Software"), to
     2.7 + * deal in the Software without restriction, including without limitation the
     2.8 + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
     2.9 + * sell copies of the Software, and to permit persons to whom the Software is
    2.10 + * furnished to do so, subject to the following conditions:
    2.11 + *
    2.12 + * The above copyright notice and this permission notice shall be included in
    2.13 + * all copies or substantial portions of the Software.
    2.14 + *
    2.15 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    2.16 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    2.17 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    2.18 + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    2.19 + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    2.20 + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
    2.21 + * DEALINGS IN THE SOFTWARE.
    2.22 + */
    2.23 +
    2.24  #ifndef __XEN_BLKIF_H__
    2.25  #define __XEN_BLKIF_H__
    2.26  
     3.1 --- a/include/xen/interface/io/protocols.h	Fri Feb 22 08:36:10 2008 -0700
     3.2 +++ b/include/xen/interface/io/protocols.h	Tue Feb 26 10:12:31 2008 -0700
     3.3 @@ -1,3 +1,25 @@
     3.4 +/******************************************************************************
     3.5 + * protocols.h
     3.6 + * 
     3.7 + * Permission is hereby granted, free of charge, to any person obtaining a copy
     3.8 + * of this software and associated documentation files (the "Software"), to
     3.9 + * deal in the Software without restriction, including without limitation the
    3.10 + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
    3.11 + * sell copies of the Software, and to permit persons to whom the Software is
    3.12 + * furnished to do so, subject to the following conditions:
    3.13 + *
    3.14 + * The above copyright notice and this permission notice shall be included in
    3.15 + * all copies or substantial portions of the Software.
    3.16 + *
    3.17 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    3.18 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    3.19 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    3.20 + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    3.21 + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    3.22 + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
    3.23 + * DEALINGS IN THE SOFTWARE.
    3.24 + */
    3.25 +
    3.26  #ifndef __XEN_PROTOCOLS_H__
    3.27  #define __XEN_PROTOCOLS_H__
    3.28  
     4.1 --- a/include/xen/interface/kexec.h	Fri Feb 22 08:36:10 2008 -0700
     4.2 +++ b/include/xen/interface/kexec.h	Tue Feb 26 10:12:31 2008 -0700
     4.3 @@ -1,6 +1,24 @@
     4.4  /******************************************************************************
     4.5   * kexec.h - Public portion
     4.6   * 
     4.7 + * Permission is hereby granted, free of charge, to any person obtaining a copy
     4.8 + * of this software and associated documentation files (the "Software"), to
     4.9 + * deal in the Software without restriction, including without limitation the
    4.10 + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
    4.11 + * sell copies of the Software, and to permit persons to whom the Software is
    4.12 + * furnished to do so, subject to the following conditions:
    4.13 + *
    4.14 + * The above copyright notice and this permission notice shall be included in
    4.15 + * all copies or substantial portions of the Software.
    4.16 + *
    4.17 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    4.18 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    4.19 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    4.20 + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    4.21 + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    4.22 + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
    4.23 + * DEALINGS IN THE SOFTWARE.
    4.24 + * 
    4.25   * Xen port written by:
    4.26   * - Simon 'Horms' Horman <horms@verge.net.au>
    4.27   * - Magnus Damm <magnus@valinux.co.jp>
     5.1 --- a/include/xen/interface/libelf.h	Fri Feb 22 08:36:10 2008 -0700
     5.2 +++ b/include/xen/interface/libelf.h	Tue Feb 26 10:12:31 2008 -0700
     5.3 @@ -1,3 +1,25 @@
     5.4 +/******************************************************************************
     5.5 + * libelf.h
     5.6 + * 
     5.7 + * Permission is hereby granted, free of charge, to any person obtaining a copy
     5.8 + * of this software and associated documentation files (the "Software"), to
     5.9 + * deal in the Software without restriction, including without limitation the
    5.10 + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
    5.11 + * sell copies of the Software, and to permit persons to whom the Software is
    5.12 + * furnished to do so, subject to the following conditions:
    5.13 + *
    5.14 + * The above copyright notice and this permission notice shall be included in
    5.15 + * all copies or substantial portions of the Software.
    5.16 + *
    5.17 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    5.18 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    5.19 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    5.20 + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    5.21 + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    5.22 + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
    5.23 + * DEALINGS IN THE SOFTWARE.
    5.24 + */
    5.25 +
    5.26  #ifndef __XC_LIBELF__
    5.27  #define __XC_LIBELF__ 1
    5.28