Merge commit 'v3.7-rc1' into stable/for-linus-3.7

* commit 'v3.7-rc1': (10892 commits)
  Linux 3.7-rc1
  x86, boot: Explicitly include autoconf.h for hostprogs
  perf: Fix UAPI fallout
  ARM: config: make sure that platforms are ordered by option string
  ARM: config: sort select statements alphanumerically
  UAPI: (Scripted) Disintegrate include/linux/byteorder
  UAPI: (Scripted) Disintegrate include/linux
  UAPI: Unexport linux/blk_types.h
  UAPI: Unexport part of linux/ppp-comp.h
  perf: Handle new rbtree implementation
  procfs: don't need a PATH_MAX allocation to hold a string representation of an int
  vfs: embed struct filename inside of names_cache allocation if possible
  audit: make audit_inode take struct filename
  vfs: make path_openat take a struct filename pointer
  vfs: turn do_path_lookup into wrapper around struct filename variant
  audit: allow audit code to satisfy getname requests from its names_list
  vfs: define struct filename and have getname() return it
  btrfs: Fix compilation with user namespace support enabled
  userns: Fix posix_acl_file_xattr_userns gid conversion
  userns: Properly print bluetooth socket uids
  ...

1 files changed, 60 insertions, 0 deletions

diff --git a/include/uapi/linux/sonet.h b/include/uapi/linux/sonet.h
new file mode 100644
index 000000000000..cc54acee81ba
--- /dev/null
+++ b/include/uapi/linux/sonet.h
@@ -0,0 +1,60 @@
+/* sonet.h - SONET/SHD physical layer control */
+ 
+/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
+ 
+
+#ifndef _UAPILINUX_SONET_H
+#define _UAPILINUX_SONET_H
+
+#define __SONET_ITEMS \
+    __HANDLE_ITEM(section_bip);         /* section parity errors (B1) */ \
+    __HANDLE_ITEM(line_bip);            /* line parity errors (B2) */ \
+    __HANDLE_ITEM(path_bip);            /* path parity errors (B3) */ \
+    __HANDLE_ITEM(line_febe);           /* line parity errors at remote */ \
+    __HANDLE_ITEM(path_febe);           /* path parity errors at remote */ \
+    __HANDLE_ITEM(corr_hcs);            /* correctable header errors */ \
+    __HANDLE_ITEM(uncorr_hcs);          /* uncorrectable header errors */ \
+    __HANDLE_ITEM(tx_cells);            /* cells sent */ \
+    __HANDLE_ITEM(rx_cells);            /* cells received */
+
+struct sonet_stats {
+#define __HANDLE_ITEM(i) int i
+        __SONET_ITEMS
+#undef __HANDLE_ITEM
+} __attribute__ ((packed));
+
+
+#define SONET_GETSTAT   _IOR('a',ATMIOC_PHYTYP,struct sonet_stats)
+                                        /* get statistics */
+#define SONET_GETSTATZ  _IOR('a',ATMIOC_PHYTYP+1,struct sonet_stats)
+                                        /* ... and zero counters */
+#define SONET_SETDIAG   _IOWR('a',ATMIOC_PHYTYP+2,int)
+                                        /* set error insertion */
+#define SONET_CLRDIAG   _IOWR('a',ATMIOC_PHYTYP+3,int)
+                                        /* clear error insertion */
+#define SONET_GETDIAG   _IOR('a',ATMIOC_PHYTYP+4,int)
+                                        /* query error insertion */
+#define SONET_SETFRAMING _IOW('a',ATMIOC_PHYTYP+5,int)
+                                        /* set framing mode (SONET/SDH) */
+#define SONET_GETFRAMING _IOR('a',ATMIOC_PHYTYP+6,int)
+                                        /* get framing mode */
+#define SONET_GETFRSENSE _IOR('a',ATMIOC_PHYTYP+7, \
+  unsigned char[SONET_FRSENSE_SIZE])    /* get framing sense information */
+
+#define SONET_INS_SBIP    1             /* section BIP */
+#define SONET_INS_LBIP    2             /* line BIP */
+#define SONET_INS_PBIP    4             /* path BIP */
+#define SONET_INS_FRAME   8             /* out of frame */
+#define SONET_INS_LOS    16             /* set line to zero */
+#define SONET_INS_LAIS   32             /* line alarm indication signal */
+#define SONET_INS_PAIS   64             /* path alarm indication signal */
+#define SONET_INS_HCS   128             /* insert HCS error */
+
+#define SONET_FRAME_SONET 0             /* SONET STS-3 framing */
+#define SONET_FRAME_SDH   1             /* SDH STM-1 framing */
+
+#define SONET_FRSENSE_SIZE 6            /* C1[3],H1[3] (0xff for unknown) */
+
+
+
+#endif /* _UAPILINUX_SONET_H */