Date: Sun, 26 Apr 2009 09:05:46 GMT From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 161101 for review Message-ID: <200904260905.n3Q95kQ0062544@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=161101 Change 161101 by bz@bz_dumpster on 2009/04/26 09:05:10 Make compile again. Affected files ... .. //depot/projects/s390/sys/s390/include/elf.h#3 edit .. //depot/projects/s390/sys/s390/include/pmap.h#6 edit .. //depot/projects/s390/sys/s390x/include/elf.h#2 edit .. //depot/projects/s390/sys/sys/vimage.h#4 edit Differences ... ==== //depot/projects/s390/sys/s390/include/elf.h#3 (text+ko) ==== @@ -72,8 +72,9 @@ #define AT_EUID 12 /* Effective uid. */ #define AT_GID 13 /* Real gid. */ #define AT_EGID 14 /* Effective gid. */ +#define AT_EXECPATH 15 /* Path to the executable. */ -#define AT_COUNT 15 /* Count of defined aux entry types. */ +#define AT_COUNT 16 /* Count of defined aux entry types. */ /* Relocation types. */ #define R_390_NONE 0 ==== //depot/projects/s390/sys/s390/include/pmap.h#6 (text+ko) ==== @@ -91,6 +91,9 @@ #define PMAP_MTX(pmap) (&(pmap)->pm_mtx) #define PMAP_TRYLOCK(pmap) mtx_trylock(&(pmap)->pm_mtx) #define PMAP_UNLOCK(pmap) mtx_unlock(&(pmap)->pm_mtx) + +extern struct pmap kernel_pmap_store; +#define kernel_pmap (&kernel_pmap_store) #endif /* ==== //depot/projects/s390/sys/s390x/include/elf.h#2 (text+ko) ==== @@ -72,8 +72,9 @@ #define AT_EUID 12 /* Effective uid. */ #define AT_GID 13 /* Real gid. */ #define AT_EGID 14 /* Effective gid. */ +#define AT_EXECPATH 15 /* Path to the executable. */ -#define AT_COUNT 15 /* Count of defined aux entry types. */ +#define AT_COUNT 16 /* Count of defined aux entry types. */ /* Relocation types. */ #define R_390_NONE 0 ==== //depot/projects/s390/sys/sys/vimage.h#4 (text+ko) ==== @@ -211,6 +211,21 @@ #define SIZEOF_vnet_inet6 8536 #define SIZEOF_vnet_ipsec 31048 #endif +#ifdef __s390__ +#ifdef __s390x__ +#define SIZEOF_vnet_net 0 +#define SIZEOF_vnet_net_LINT 0 +#define SIZEOF_vnet_inet 0 +#define SIZEOF_vnet_inet6 0 +#define SIZEOF_vnet_ipsec 0 +#else +#define SIZEOF_vnet_net 0 +#define SIZEOF_vnet_net_LINT 0 +#define SIZEOF_vnet_inet 0 +#define SIZEOF_vnet_inet6 0 +#define SIZEOF_vnet_ipsec 0 +#endif +#endif #ifdef __sparc64__ /* incl. sun4v */ #define SIZEOF_vnet_net 464 #define SIZEOF_vnet_net_LINT 5144
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200904260905.n3Q95kQ0062544>