[PATCH] powerpc: Move ehea hcall definitions into hvcall.h

[Thomas Klein]

Anton Blanchard wrote:
> Move ehea hcall definitions into hvcall.h.
> 
> Signed-off-by: Anton Blanchard <anton at samba.org>

Acked-by: Thomas Klein <tklein at de.ibm.com>

> ---
> 
> Index: linux.trees.git/arch/powerpc/include/asm/hvcall.h
> ===================================================================
> --- linux.trees.git.orig/arch/powerpc/include/asm/hvcall.h	2009-10-19 17:59:42.000000000 +1100
> +++ linux.trees.git/arch/powerpc/include/asm/hvcall.h	2009-10-19 18:03:18.000000000 +1100
> @@ -212,6 +212,19 @@
>  #define H_QUERY_INT_STATE       0x1E4
>  #define H_POLL_PENDING		0x1D8
>  #define H_ILLAN_ATTRIBUTES	0x244
> +#define H_MODIFY_HEA_QP		0x250
> +#define H_QUERY_HEA_QP		0x254
> +#define H_QUERY_HEA		0x258
> +#define H_QUERY_HEA_PORT	0x25C
> +#define H_MODIFY_HEA_PORT	0x260
> +#define H_REG_BCMC		0x264
> +#define H_DEREG_BCMC		0x268
> +#define H_REGISTER_HEA_RPAGES	0x26C
> +#define H_DISABLE_AND_GET_HEA	0x270
> +#define H_GET_HEA_INFO		0x274
> +#define H_ALLOC_HEA_RESOURCE	0x278
> +#define H_ADD_CONN		0x284
> +#define H_DEL_CONN		0x288
>  #define H_JOIN			0x298
>  #define H_VASI_STATE            0x2A4
>  #define H_ENABLE_CRQ		0x2B0
> Index: linux.trees.git/drivers/net/ehea/ehea_phyp.h
> ===================================================================
> --- linux.trees.git.orig/drivers/net/ehea/ehea_phyp.h	2009-10-19 18:03:48.000000000 +1100
> +++ linux.trees.git/drivers/net/ehea/ehea_phyp.h	2009-10-19 18:03:56.000000000 +1100
> @@ -33,7 +33,6 @@
>  #include <asm/hvcall.h>
>  #include "ehea.h"
>  #include "ehea_hw.h"
> -#include "ehea_hcall.h"
> 
>  /* Some abbreviations used here:
>   *
> Index: linux.trees.git/drivers/net/ehea/ehea_hcall.h
> ===================================================================
> --- linux.trees.git.orig/drivers/net/ehea/ehea_hcall.h	2009-10-19 17:59:31.000000000 +1100
> +++ /dev/null	1970-01-01 00:00:00.000000000 +0000
> @@ -1,51 +0,0 @@
> -/*
> - *  linux/drivers/net/ehea/ehea_hcall.h
> - *
> - *  eHEA ethernet device driver for IBM eServer System p
> - *
> - *  (C) Copyright IBM Corp. 2006
> - *
> - *  Authors:
> - *       Christoph Raisch <raisch at de.ibm.com>
> - *       Jan-Bernd Themann <themann at de.ibm.com>
> - *       Thomas Klein <tklein at de.ibm.com>
> - *
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License as published by
> - * the Free Software Foundation; either version 2, or (at your option)
> - * any later version.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
> - * GNU General Public License for more details.
> - *
> - * You should have received a copy of the GNU General Public License
> - * along with this program; if not, write to the Free Software
> - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> - */
> -
> -#ifndef __EHEA_HCALL_H__
> -#define __EHEA_HCALL_H__
> -
> -/**
> - * This file contains HCALL defines that are to be included in the appropriate
> - * kernel files later
> - */
> -
> -#define H_ALLOC_HEA_RESOURCE   0x278
> -#define H_MODIFY_HEA_QP        0x250
> -#define H_QUERY_HEA_QP         0x254
> -#define H_QUERY_HEA            0x258
> -#define H_QUERY_HEA_PORT       0x25C
> -#define H_MODIFY_HEA_PORT      0x260
> -#define H_REG_BCMC             0x264
> -#define H_DEREG_BCMC           0x268
> -#define H_REGISTER_HEA_RPAGES  0x26C
> -#define H_DISABLE_AND_GET_HEA  0x270
> -#define H_GET_HEA_INFO         0x274
> -#define H_ADD_CONN             0x284
> -#define H_DEL_CONN             0x288
> -
> -#endif	/* __EHEA_HCALL_H__ */
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev at lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/linuxppc-dev