X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Fioctl.h;h=785417c2fedebd7ce84d414e9cd264099ce9eca1;hb=0810df383cc006f8a06adbd3c262367bd9d9472a;hp=6c3eb5ac2b60b146c94f45d61c36feff17f3401d;hpb=0f2a47eabd726fa150ca17894aafe6c524698cc8;p=fs%2Flustre-release.git

diff --git a/lustre/include/ioctl.h b/lustre/include/ioctl.h
index 6c3eb5a..785417c 100644
--- a/lustre/include/ioctl.h
+++ b/lustre/include/ioctl.h
@@ -1,14 +1,47 @@
+/*
+ * GPL HEADER START
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
+ *
+ * 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 version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
+ */
 
 #ifndef _IOWR
 
-/*
- * on i386 and x86_64, _ASM_I386_IOCTL_H is defined by the kernel's ioctl.h
+/* On i386 and x86_64, _ASM_I386_IOCTL_H is defined by the kernel's ioctl.h,
+ * and on newer kernels this header is shared as _ASM_GENERIC_IOCTL_H.
  *
- * We can avoid any problems with the kernel header being included again
- * by defining _ASM_I386_IOCTL_H here so that a later occurence of
- * <asm/ioctl.h> does not include the kernel's ioctl.h after this one.
- */
+ * We can avoid any problems with the kernel header being included again by
+ * defining _ASM_I386_IOCTL_H here so that a later occurence of <asm/ioctl.h>
+ * does not include the kernel's ioctl.h after this one. b=14746 */
 #define _ASM_I386_IOCTL_H
+#define _ASM_GENERIC_IOCTL_H
 
 /* ioctl command encoding: 32 bits total, command in lower 16 bits,
  * size of the parameter structure in the lower 14 bits of the
@@ -71,4 +104,3 @@
 #define IOCSIZE_SHIFT   (_IOC_SIZESHIFT)
 
 #endif /* _IOWR */
-