diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2012-10-17 08:59:20 (GMT) |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2012-10-17 08:59:20 (GMT) |
commit | 0b4f5b1d6385826093dc3cd9035b186f0d77a5dc (patch) | |
tree | e7602057216d3de837995b267a281ae09d899a26 /arch/s390/include/asm/monwriter.h | |
parent | 939ccba437da1726a5c8a5b702a47d473da927ae (diff) | |
parent | 9f0d3c2781baa1102108e16efbe640dd74564a7c (diff) | |
download | linux-fsl-qoriq-0b4f5b1d6385826093dc3cd9035b186f0d77a5dc.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
To obtain new flag FLOWI_FLAG_KNOWN_NH to fix netfilter's xt_TEE target.
Diffstat (limited to 'arch/s390/include/asm/monwriter.h')
-rw-r--r-- | arch/s390/include/asm/monwriter.h | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/arch/s390/include/asm/monwriter.h b/arch/s390/include/asm/monwriter.h deleted file mode 100644 index f845c8e..0000000 --- a/arch/s390/include/asm/monwriter.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright IBM Corp. 2006 - * Character device driver for writing z/VM APPLDATA monitor records - * Version 1.0 - * Author(s): Melissa Howland <melissah@us.ibm.com> - * - */ - -#ifndef _ASM_390_MONWRITER_H -#define _ASM_390_MONWRITER_H - -/* mon_function values */ -#define MONWRITE_START_INTERVAL 0x00 /* start interval recording */ -#define MONWRITE_STOP_INTERVAL 0x01 /* stop interval or config recording */ -#define MONWRITE_GEN_EVENT 0x02 /* generate event record */ -#define MONWRITE_START_CONFIG 0x03 /* start configuration recording */ - -/* the header the app uses in its write() data */ -struct monwrite_hdr { - unsigned char mon_function; - unsigned short applid; - unsigned char record_num; - unsigned short version; - unsigned short release; - unsigned short mod_level; - unsigned short datalen; - unsigned char hdrlen; - -} __attribute__((packed)); - -#endif /* _ASM_390_MONWRITER_H */ |