rpms/kernel/devel linux-2.6-gfs2-dlm-headers.patch, NONE, 1.1 kernel-2.6.spec, 1.2259, 1.2260 linux-2.6-gfs2-dlm.patch, 1.2, 1.3 linux-2.6-header-cleanup-git.patch, 1.19, 1.20
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Jun 9 17:12:14 UTC 2006
Author: dwmw2
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12452
Modified Files:
kernel-2.6.spec linux-2.6-gfs2-dlm.patch
linux-2.6-header-cleanup-git.patch
Added Files:
linux-2.6-gfs2-dlm-headers.patch
Log Message:
Update GFS2 patch, export GFS2 and DLM headers
linux-2.6-gfs2-dlm-headers.patch:
Kbuild | 3 +++
1 files changed, 3 insertions(+)
--- NEW FILE linux-2.6-gfs2-dlm-headers.patch ---
--- linux-2.6.16.ppc/include/linux/Kbuild~ 2006-05-25 15:23:00.000000000 +0100
+++ linux-2.6.16.ppc/include/linux/Kbuild 2006-06-09 18:07:47.000000000 +0100
@@ -61,3 +61,6 @@ unifdef-y += acct.h adb.h adfs_fs.h agpg
wanrouter.h watchdog.h xfrm.h zftape.h
objhdr-y := version.h
+
+header-y += dlm.h dlm_device.h lock_dlm_plock.h
+unifdef-y += gfs2_ondisk.h iflags.h
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2259
retrieving revision 1.2260
diff -u -r1.2259 -r1.2260
--- kernel-2.6.spec 9 Jun 2006 16:38:27 -0000 1.2259
+++ kernel-2.6.spec 9 Jun 2006 17:12:11 -0000 1.2260
@@ -363,6 +363,7 @@
# GFS/DLM
Patch1500: linux-2.6-gfs2-dlm.patch
+Patch1501: linux-2.6-gfs2-dlm-headers.patch
# Misc bits.
Patch1600: linux-2.6-module_version.patch
@@ -1125,6 +1126,7 @@
%if %{buildheaders}
%patch50 -p1
%patch51 -p1
+%patch1501 -p1
%endif
# END OF PATCH APPLICATIONS
@@ -1808,6 +1810,9 @@
%endif
%changelog
+* Fri Jun 9 2006 David Woodhouse <dwmw2 at redhat.com>
+- Update GFS2 patch, export GFS2 and DLM headers
+
* Fri Jun 9 2006 Dave Jones <davej at redhat.com>
- Disable KGDB again, it broke serial console :(
linux-2.6-gfs2-dlm.patch:
CREDITS | 6
Documentation/filesystems/gfs2.txt | 43
MAINTAINERS | 18
fs/Kconfig | 2
fs/Makefile | 2
fs/configfs/item.c | 2
fs/dlm/Kconfig | 29
fs/dlm/Makefile | 21
fs/dlm/ast.c | 167 +
fs/dlm/ast.h | 26
fs/dlm/config.c | 789 ++++++++
fs/dlm/config.h | 42
fs/dlm/debug_fs.c | 296 +++
fs/dlm/device.c | 1237 ++++++++++++
fs/dlm/dir.c | 423 ++++
fs/dlm/dir.h | 30
fs/dlm/dlm_internal.h | 494 +++++
fs/dlm/lock.c | 3547 +++++++++++++++++++++++++++++++++++++
fs/dlm/lock.h | 50
fs/dlm/lockspace.c | 678 +++++++
fs/dlm/lockspace.h | 24
fs/dlm/lowcomms.c | 1239 ++++++++++++
fs/dlm/lowcomms.h | 26
fs/dlm/lvb_table.h | 18
fs/dlm/main.c | 89
fs/dlm/member.c | 312 +++
fs/dlm/member.h | 24
fs/dlm/memory.c | 106 +
fs/dlm/memory.h | 29
fs/dlm/midcomms.c | 140 +
fs/dlm/midcomms.h | 21
fs/dlm/rcom.c | 457 ++++
fs/dlm/rcom.h | 24
fs/dlm/recover.c | 762 +++++++
fs/dlm/recover.h | 34
fs/dlm/recoverd.c | 285 ++
fs/dlm/recoverd.h | 24
fs/dlm/requestqueue.c | 184 +
fs/dlm/requestqueue.h | 22
fs/dlm/util.c | 161 +
fs/dlm/util.h | 22
fs/gfs2/Kconfig | 44
fs/gfs2/Makefile | 10
fs/gfs2/acl.c | 315 +++
fs/gfs2/acl.h | 37
fs/gfs2/bmap.c | 1103 +++++++++++
fs/gfs2/bmap.h | 32
fs/gfs2/daemon.c | 223 ++
fs/gfs2/daemon.h | 20
fs/gfs2/dir.c | 1974 ++++++++++++++++++++
fs/gfs2/dir.h | 73
fs/gfs2/eaops.c | 230 ++
fs/gfs2/eaops.h | 31
fs/gfs2/eattr.c | 1548 ++++++++++++++++
fs/gfs2/eattr.h | 97 +
fs/gfs2/format.h | 21
fs/gfs2/gfs2.h | 31
fs/gfs2/glock.c | 2340 ++++++++++++++++++++++++
fs/gfs2/glock.h | 155 +
fs/gfs2/glops.c | 491 +++++
fs/gfs2/glops.h | 23
fs/gfs2/incore.h | 683 +++++++
fs/gfs2/inode.c | 1820 ++++++++++++++++++
fs/gfs2/inode.h | 72
fs/gfs2/lm.c | 244 ++
fs/gfs2/lm.h | 41
fs/gfs2/lm_interface.h | 295 +++
fs/gfs2/locking.c | 191 +
fs/gfs2/locking/dlm/Makefile | 3
fs/gfs2/locking/dlm/lock.c | 541 +++++
fs/gfs2/locking/dlm/lock_dlm.h | 188 +
fs/gfs2/locking/dlm/main.c | 64
fs/gfs2/locking/dlm/mount.c | 256 ++
fs/gfs2/locking/dlm/plock.c | 299 +++
fs/gfs2/locking/dlm/sysfs.c | 225 ++
fs/gfs2/locking/dlm/thread.c | 352 +++
fs/gfs2/locking/nolock/Makefile | 3
fs/gfs2/locking/nolock/main.c | 259 ++
fs/gfs2/log.c | 598 ++++++
fs/gfs2/log.h | 61
fs/gfs2/lops.c | 804 ++++++++
fs/gfs2/lops.h | 96 +
fs/gfs2/lvb.c | 45
fs/gfs2/lvb.h | 19
fs/gfs2/main.c | 129 +
fs/gfs2/meta_io.c | 892 +++++++++
fs/gfs2/meta_io.h | 89
fs/gfs2/mount.c | 214 ++
fs/gfs2/mount.h | 15
fs/gfs2/ondisk.c | 321 +++
fs/gfs2/ops_address.c | 670 ++++++
fs/gfs2/ops_address.h | 17
fs/gfs2/ops_dentry.c | 123 +
fs/gfs2/ops_dentry.h | 15
fs/gfs2/ops_export.c | 297 +++
fs/gfs2/ops_export.h | 15
fs/gfs2/ops_file.c | 1000 ++++++++++
fs/gfs2/ops_file.h | 20
fs/gfs2/ops_fstype.c | 901 +++++++++
fs/gfs2/ops_fstype.h | 16
fs/gfs2/ops_inode.c | 1194 ++++++++++++
fs/gfs2/ops_inode.h | 18
fs/gfs2/ops_super.c | 399 ++++
fs/gfs2/ops_super.h | 15
fs/gfs2/ops_vm.c | 195 ++
fs/gfs2/ops_vm.h | 16
fs/gfs2/page.c | 280 ++
fs/gfs2/page.h | 23
fs/gfs2/quota.c | 1305 +++++++++++++
fs/gfs2/quota.h | 32
fs/gfs2/recovery.c | 576 ++++++
fs/gfs2/recovery.h | 32
fs/gfs2/rgrp.c | 1524 +++++++++++++++
fs/gfs2/rgrp.h | 62
fs/gfs2/super.c | 945 +++++++++
fs/gfs2/super.h | 52
fs/gfs2/sys.c | 581 ++++++
fs/gfs2/sys.h | 24
fs/gfs2/trans.c | 184 +
fs/gfs2/trans.h | 35
fs/gfs2/unlinked.c | 459 ++++
fs/gfs2/unlinked.h | 25
fs/gfs2/util.c | 245 ++
fs/gfs2/util.h | 169 +
include/linux/dlm.h | 302 +++
include/linux/dlm_device.h | 86
include/linux/fs.h | 3
include/linux/gfs2_ondisk.h | 459 ++++
include/linux/iflags.h | 102 +
include/linux/kernel.h | 1
include/linux/lock_dlm_plock.h | 40
kernel/printk.c | 1
mm/filemap.c | 1
mm/readahead.c | 1
134 files changed, 41978 insertions(+), 4 deletions(-)
Index: linux-2.6-gfs2-dlm.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-gfs2-dlm.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-gfs2-dlm.patch 25 May 2006 17:23:20 -0000 1.2
+++ linux-2.6-gfs2-dlm.patch 9 Jun 2006 17:12:12 -0000 1.3
@@ -67,10 +67,10 @@
+ mount.gfs2 to help mount(8) mount a filesystem
+ mkfs.gfs2 to make a filesystem
diff --git a/MAINTAINERS b/MAINTAINERS
-index bd10b2a..328da34 100644
+index c3c5842..e593ace 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -828,6 +828,16 @@ M: jack at suse.cz
+@@ -840,6 +840,16 @@ M: jack at suse.cz
L: linux-kernel at vger.kernel.org
S: Maintained
@@ -87,7 +87,7 @@
DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
P: Tobias Ringstrom
M: tori at unhappy.mine.nu
-@@ -1078,6 +1088,14 @@ M: khc at pm.waw.pl
+@@ -1090,6 +1100,14 @@ M: khc at pm.waw.pl
W: http://www.kernel.org/pub/linux/utils/net/hdlc/
S: Maintained
@@ -1563,15 +1563,15 @@
+
diff --git a/fs/dlm/device.c b/fs/dlm/device.c
new file mode 100644
-index 0000000..49a20d5
+index 0000000..47798fe
--- /dev/null
+++ b/fs/dlm/device.c
-@@ -0,0 +1,1091 @@
+@@ -0,0 +1,1237 @@
+/******************************************************************************
+*******************************************************************************
+**
+** Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
-+** Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved.
++** Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved.
+**
+** This copyrighted material is made available to anyone wishing to use,
+** modify, copy, or redistribute it subject to the terms and conditions
@@ -1628,6 +1628,9 @@
+#define LS_FLAG_DELETED 1
+#define LS_FLAG_AUTOFREE 2
+
++/* flags in ls_flags*/
++#define FI_FLAG_OPEN 1
++#define FI_FLAG_COMPAT 2
+
+#define LOCKINFO_MAGIC 0x53595324
+
@@ -1686,10 +1689,111 @@
+ wait_queue_head_t fi_wait;
+ struct user_ls *fi_ls;
+ atomic_t fi_refcnt; /* Number of users */
-+ unsigned long fi_flags; /* Bit 1 means the device is open */
++ unsigned long fi_flags;
++};
++
++#ifdef CONFIG_COMPAT
++
++struct dlm_lock_params32 {
++ __u8 mode;
++ __u8 namelen;
++ __u16 flags;
++ __u32 lkid;
++ __u32 parent;
++
++ __u32 castparam;
++ __u32 castaddr;
++ __u32 bastparam;
++ __u32 bastaddr;
++ __u32 lksb;
++
++ char lvb[DLM_USER_LVB_LEN];
++ char name[0];
++};
++
++struct dlm_write_request32 {
++ __u32 version[3];
++ __u8 cmd;
++ __u8 is64bit;
++ __u8 unused[2];
++
++ union {
++ struct dlm_lock_params32 lock;
++ struct dlm_lspace_params lspace;
++ } i;
++};
++
++struct dlm_lksb32 {
++ __u32 sb_status;
++ __u32 sb_lkid;
++ __u8 sb_flags;
++ __u32 sb_lvbptr;
++};
++
++struct dlm_lock_result32 {
++ __u32 length;
++ __u32 user_astaddr;
++ __u32 user_astparam;
++ __u32 user_lksb;
++ struct dlm_lksb32 lksb;
++ __u8 bast_mode;
++ __u8 unused[3];
++ /* Offsets may be zero if no data is present */
++ __u32 lvb_offset;
+};
+
+
++static void compat_input(struct dlm_write_request *kparams, struct dlm_write_request32 *k32params)
++{
++
++ kparams->version[0] = k32params->version[0];
++ kparams->version[1] = k32params->version[1];
++ kparams->version[2] = k32params->version[2];
++
++ kparams->cmd = k32params->cmd;
++ kparams->is64bit = k32params->is64bit;
++ if (kparams->cmd == DLM_USER_CREATE_LOCKSPACE ||
++ kparams->cmd == DLM_USER_REMOVE_LOCKSPACE) {
++
++ kparams->i.lspace.flags = k32params->i.lspace.flags;
++ kparams->i.lspace.minor = k32params->i.lspace.minor;
++ strcpy(kparams->i.lspace.name, k32params->i.lspace.name);
++ }
++ else {
++ kparams->i.lock.mode = k32params->i.lock.mode;
++ kparams->i.lock.namelen = k32params->i.lock.namelen;
++ kparams->i.lock.flags = k32params->i.lock.flags;
++ kparams->i.lock.lkid = k32params->i.lock.lkid;
++ kparams->i.lock.parent = k32params->i.lock.parent;
++ kparams->i.lock.castparam = (void *)(long)k32params->i.lock.castparam;
++ kparams->i.lock.castaddr = (void *)(long)k32params->i.lock.castaddr;
++ kparams->i.lock.bastparam = (void *)(long)k32params->i.lock.bastparam;
++ kparams->i.lock.bastaddr = (void *)(long)k32params->i.lock.bastaddr;
++ kparams->i.lock.lksb = (void *)(long)k32params->i.lock.lksb;
++ memcpy(kparams->i.lock.lvb, k32params->i.lock.lvb, DLM_USER_LVB_LEN);
++ memcpy(kparams->i.lock.name, k32params->i.lock.name, kparams->i.lock.namelen);
++ }
++}
++
++void compat_output(struct dlm_lock_result *res, struct dlm_lock_result32 *res32)
++{
++ res32->length = res->length - (sizeof(struct dlm_lock_result) - sizeof(struct dlm_lock_result32));
++ res32->user_astaddr = (__u32)(long)res->user_astaddr;
++ res32->user_astparam = (__u32)(long)res->user_astparam;
++ res32->user_lksb = (__u32)(long)res->user_lksb;
++ res32->bast_mode = res->bast_mode;
++
++ res32->lvb_offset = res->lvb_offset;
++ res32->length = res->length;
++
++ res32->lksb.sb_status = res->lksb.sb_status;
++ res32->lksb.sb_flags = res->lksb.sb_flags;
++ res32->lksb.sb_lkid = res->lksb.sb_lkid;
++ res32->lksb.sb_lvbptr = (__u32)(long)res->lksb.sb_lvbptr;
++}
++#endif
++
++
+/* get and put ops for file_info.
+ Actually I don't really like "get" and "put", but everyone
+ else seems to use them and I can't think of anything
@@ -1933,7 +2037,7 @@
+ li->li_grmode = li->li_rqmode;
+
+ /* Only queue AST if the device is still open */
-+ if (test_bit(1, &li->li_file->fi_flags))
++ if (test_bit(FI_FLAG_OPEN, &li->li_file->fi_flags))
+ add_to_astqueue(li, li->li_castaddr, li->li_castparam,
+ lvb_updated);
+
@@ -2018,7 +2122,7 @@
+ f->fi_ls = lsinfo;
+ f->fi_flags = 0;
+ get_file_info(f);
-+ set_bit(1, &f->fi_flags);
++ set_bit(FI_FLAG_OPEN, &f->fi_flags);
+
+ file->private_data = f;
+
@@ -2063,7 +2167,7 @@
+ return -ENOENT;
+
+ /* Mark this closed so that ASTs will not be delivered any more */
-+ clear_bit(1, &f->fi_flags);
++ clear_bit(FI_FLAG_OPEN, &f->fi_flags);
+
+ /* Block signals while we are doing this */
+ sigfillset(&allsigs);
@@ -2212,11 +2316,18 @@
+{
+ struct file_info *fi = file->private_data;
+ struct ast_info *ast;
++ void *data;
+ int data_size;
++ int struct_size;
+ int offset;
+ DECLARE_WAITQUEUE(wait, current);
++#ifdef CONFIG_COMPAT
++ struct dlm_lock_result32 result32;
+
++ if (count < sizeof(struct dlm_lock_result32))
++#else
+ if (count < sizeof(struct dlm_lock_result))
++#endif
+ return -EINVAL;
+
+ spin_lock(&fi->fi_ast_lock);
@@ -2260,11 +2371,21 @@
+ spin_unlock(&fi->fi_ast_lock);
+
+ /* Work out the size of the returned data */
-+ data_size = sizeof(struct dlm_lock_result);
++#ifdef CONFIG_COMPAT
++ if (test_bit(FI_FLAG_COMPAT, &fi->fi_flags)) {
++ data_size = struct_size = sizeof(struct dlm_lock_result32);
++ data = &result32;
++ }
++ else
++#endif
++ {
++ data_size = struct_size = sizeof(struct dlm_lock_result);
++ data = &ast->result;
++ }
+ if (ast->lvb_updated && ast->result.lksb.sb_lvbptr)
+ data_size += DLM_USER_LVB_LEN;
+
-+ offset = sizeof(struct dlm_lock_result);
++ offset = struct_size;
+
+ /* Room for the extended data ? */
+ if (count >= data_size) {
@@ -2280,8 +2401,13 @@
+ }
+
+ ast->result.length = data_size;
++
++#ifdef CONFIG_COMPAT
++ compat_output(&ast->result, &result32);
++#endif
++
+ /* Copy the header now it has all the offsets in it */
-+ if (copy_to_user(buffer, &ast->result, sizeof(struct dlm_lock_result)))
++ if (copy_to_user(buffer, data, struct_size))
+ offset = -EFAULT;
+
+ /* If we only returned a header and there's more to come then put it
@@ -2539,8 +2665,14 @@
+ sigset_t allsigs;
+ int status;
+
-+ /* -1 because lock name is optional */
-+ if (count < sizeof(struct dlm_write_request)-1)
++#ifdef CONFIG_COMPAT
++ if (count < sizeof(struct dlm_write_request32))
++#else
++ if (count < sizeof(struct dlm_write_request))
++#endif
++ return -EINVAL;
++
++ if (count > sizeof(struct dlm_write_request) + DLM_RESNAME_MAXLEN)
+ return -EINVAL;
+
+ /* Has the lockspace been deleted */
@@ -2560,6 +2692,20 @@
+ if (check_version(kparams))
+ goto out_free;
+
++#ifdef CONFIG_COMPAT
++ if (!kparams->is64bit) {
++ struct dlm_write_request32 *k32params = (struct dlm_write_request32 *)kparams;
++ kparams = kmalloc(count + (sizeof(struct dlm_write_request) - sizeof(struct dlm_write_request32)), GFP_KERNEL);
++ if (!kparams)
++ return -ENOMEM;
++
++ if (fi)
++ set_bit(FI_FLAG_COMPAT, &fi->fi_flags);
++ compat_input(kparams, k32params);
++ kfree(k32params);
++ }
++#endif
++
+ /* Block signals while we are doing this */
+ sigfillset(&allsigs);
+ sigprocmask(SIG_BLOCK, &allsigs, &tmpsig);
@@ -16211,10 +16357,10 @@
+
diff --git a/fs/gfs2/eattr.c b/fs/gfs2/eattr.c
new file mode 100644
-index 0000000..3466015
+index 0000000..2e114c0
--- /dev/null
+++ b/fs/gfs2/eattr.c
-@@ -0,0 +1,1549 @@
+@@ -0,0 +1,1548 @@
+/*
+ * Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
+ * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved.
@@ -16591,8 +16737,8 @@
+ return 0;
+
+ if (er->er_data_len) {
-+ char *prefix;
-+ unsigned int l;
++ char *prefix = NULL;
++ unsigned int l = 0;
+ char c = 0;
+
+ if (ei->ei_size + ea_size > er->er_data_len)
@@ -16611,11 +16757,10 @@
+ prefix = "security.";
+ l = 9;
+ break;
-+ default:
-+ /* FIXME: Needs looking at again */
-+ break;
+ }
+
++ BUG_ON(l == 0);
++
+ memcpy(er->er_data + ei->ei_size, prefix, l);
+ memcpy(er->er_data + ei->ei_size + l, GFS2_EA2NAME(ea),
+ ea->ea_name_len);
@@ -20966,10 +21111,10 @@
+#endif /* __GLOPS_DOT_H__ */
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
new file mode 100644
-index 0000000..92091d0
+index 0000000..8caefec
--- /dev/null
+++ b/fs/gfs2/incore.h
-@@ -0,0 +1,687 @@
+@@ -0,0 +1,683 @@
+/*
+ * Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
+ * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved.
@@ -21130,7 +21275,7 @@
+ unsigned gh_flags;
+
+ int gh_error;
-+ unsigned long gh_iflags;
++ unsigned gh_iflags;
+ struct completion gh_wait;
+ unsigned long gh_ip;
+};
@@ -21189,25 +21334,21 @@
+struct gfs2_alloc {
+ /* Quota stuff */
+
-+ unsigned int al_qd_num;
+ struct gfs2_quota_data *al_qd[4];
+ struct gfs2_holder al_qd_ghs[4];
++ unsigned int al_qd_num;
+
-+ /* Filled in by the caller to gfs2_inplace_reserve() */
-+
-+ uint32_t al_requested;
++ u32 al_requested; /* Filled in by caller of gfs2_inplace_reserve() */
++ u32 al_alloced; /* Filled in by gfs2_alloc_*() */
+
+ /* Filled in by gfs2_inplace_reserve() */
+
-+ char *al_file;
+ unsigned int al_line;
++ char *al_file;
+ struct gfs2_holder al_ri_gh;
+ struct gfs2_holder al_rgd_gh;
+ struct gfs2_rgrpd *al_rgd;
+
-+ /* Filled in by gfs2_alloc_*() */
-+
-+ uint32_t al_alloced;
+};
+
+enum {
@@ -41939,10 +42080,10 @@
+
diff --git a/include/linux/dlm_device.h b/include/linux/dlm_device.h
new file mode 100644
-index 0000000..f8ba198
+index 0000000..2a2dd18
--- /dev/null
+++ b/include/linux/dlm_device.h
-@@ -0,0 +1,83 @@
+@@ -0,0 +1,86 @@
+/******************************************************************************
+*******************************************************************************
+**
@@ -41963,35 +42104,37 @@
+#define DLM_USER_LVB_LEN 32
+
+/* Version of the device interface */
-+#define DLM_DEVICE_VERSION_MAJOR 4
++#define DLM_DEVICE_VERSION_MAJOR 5
+#define DLM_DEVICE_VERSION_MINOR 0
+#define DLM_DEVICE_VERSION_PATCH 0
+
+/* struct passed to the lock write */
+struct dlm_lock_params {
+ __u8 mode;
++ __u8 namelen;
+ __u16 flags;
+ __u32 lkid;
+ __u32 parent;
-+ __u8 namelen;
+ void __user *castparam;
+ void __user *castaddr;
+ void __user *bastparam;
+ void __user *bastaddr;
+ struct dlm_lksb __user *lksb;
+ char lvb[DLM_USER_LVB_LEN];
-+ char name[1];
++ char name[0];
+};
+
+struct dlm_lspace_params {
+ __u32 flags;
+ __u32 minor;
-+ char name[1];
++ char name[0];
+};
+
+struct dlm_write_request {
+ __u32 version[3];
+ __u8 cmd;
++ __u8 is64bit;
++ __u8 unused[2];
+
+ union {
+ struct dlm_lock_params lock;
@@ -42008,6 +42151,7 @@
+ struct dlm_lksb __user * user_lksb;
+ struct dlm_lksb lksb;
+ __u8 bast_mode;
++ __u8 unused[3];
+ /* Offsets may be zero if no data is present */
+ __u32 lvb_offset;
+};
linux-2.6-header-cleanup-git.patch:
drivers/s390/crypto/z90crypt.h | 185 ----------------
include/acpi/platform/aclinux.h | 1
include/acpi/processor.h | 1
include/asm-alpha/bitops.h | 1
include/asm-alpha/cache.h | 1
include/asm-alpha/cacheflush.h | 1
include/asm-alpha/core_cia.h | 1
include/asm-alpha/core_t2.h | 1
include/asm-alpha/dma-mapping.h | 1
include/asm-alpha/dma.h | 1
include/asm-alpha/floppy.h | 1
include/asm-alpha/hardirq.h | 1
include/asm-alpha/hw_irq.h | 1
include/asm-alpha/ide.h | 1
include/asm-alpha/io.h | 1
include/asm-alpha/irq.h | 1
include/asm-alpha/kmap_types.h | 1
include/asm-alpha/machvec.h | 1
include/asm-alpha/mmu_context.h | 1
include/asm-alpha/mmzone.h | 1
include/asm-alpha/page.h | 1
include/asm-alpha/param.h | 1
include/asm-alpha/pgalloc.h | 1
include/asm-alpha/pgtable.h | 1
include/asm-alpha/serial.h | 1
include/asm-alpha/smp.h | 1
include/asm-alpha/spinlock.h | 1
include/asm-alpha/system.h | 1
include/asm-alpha/tlbflush.h | 1
include/asm-alpha/unistd.h | 7
include/asm-arm/apm.h | 1
include/asm-arm/arch-aaec2000/memory.h | 1
include/asm-arm/arch-cl7500/acornfb.h | 1
include/asm-arm/arch-clps711x/hardware.h | 1
include/asm-arm/arch-clps711x/memory.h | 1
include/asm-arm/arch-clps711x/uncompress.h | 1
include/asm-arm/arch-ebsa285/hardware.h | 1
include/asm-arm/arch-ebsa285/memory.h | 1
include/asm-arm/arch-ebsa285/vmalloc.h | 1
include/asm-arm/arch-integrator/smp.h | 1
include/asm-arm/arch-iop3xx/memory.h | 1
include/asm-arm/arch-iop3xx/timex.h | 1
include/asm-arm/arch-iop3xx/uncompress.h | 1
include/asm-arm/arch-ixp4xx/dma.h | 1
include/asm-arm/arch-lh7a40x/constants.h | 1
include/asm-arm/arch-lh7a40x/irqs.h | 1
include/asm-arm/arch-lh7a40x/registers.h | 1
include/asm-arm/arch-omap/board.h | 1
include/asm-arm/arch-omap/hardware.h | 1
include/asm-arm/arch-omap/system.h | 1
include/asm-arm/arch-omap/uncompress.h | 1
include/asm-arm/arch-pxa/idp.h | 1
include/asm-arm/arch-pxa/irqs.h | 1
include/asm-arm/arch-pxa/pxa-regs.h | 1
include/asm-arm/arch-pxa/timex.h | 1
include/asm-arm/arch-realview/smp.h | 1
include/asm-arm/arch-s3c2410/dma.h | 1
include/asm-arm/arch-s3c2410/uncompress.h | 1
include/asm-arm/arch-sa1100/assabet.h | 1
include/asm-arm/arch-sa1100/cerf.h | 1
include/asm-arm/arch-sa1100/collie.h | 1
include/asm-arm/arch-sa1100/dma.h | 1
include/asm-arm/arch-sa1100/hardware.h | 1
include/asm-arm/arch-sa1100/ide.h | 1
include/asm-arm/arch-sa1100/irqs.h | 1
include/asm-arm/arch-sa1100/memory.h | 1
include/asm-arm/arch-sa1100/system.h | 1
include/asm-arm/atomic.h | 1
include/asm-arm/bug.h | 1
include/asm-arm/cacheflush.h | 1
include/asm-arm/cpu.h | 1
include/asm-arm/dma-mapping.h | 1
include/asm-arm/dma.h | 1
include/asm-arm/elf.h | 1
include/asm-arm/fpstate.h | 1
include/asm-arm/glue.h | 1
include/asm-arm/hardirq.h | 1
include/asm-arm/hardware/dec21285.h | 1
include/asm-arm/hardware/iomd.h | 1
include/asm-arm/leds.h | 1
include/asm-arm/mach/serial_at91rm9200.h | 1
include/asm-arm/mach/serial_sa1100.h | 1
include/asm-arm/memory.h | 1
include/asm-arm/page.h | 1
include/asm-arm/pci.h | 1
include/asm-arm/proc-fns.h | 1
include/asm-arm/ptrace.h | 1
include/asm-arm/smp.h | 1
include/asm-arm/system.h | 1
include/asm-arm/tlbflush.h | 1
include/asm-arm/unistd.h | 10
include/asm-arm26/atomic.h | 1
include/asm-arm26/bug.h | 1
include/asm-arm26/dma.h | 1
include/asm-arm26/hardirq.h | 1
include/asm-arm26/hardware.h | 1
include/asm-arm26/io.h | 1
include/asm-arm26/leds.h | 1
include/asm-arm26/mach-types.h | 1
include/asm-arm26/page.h | 1
include/asm-arm26/pgtable.h | 1
include/asm-arm26/serial.h | 1
include/asm-arm26/smp.h | 1
include/asm-arm26/sysirq.h | 1
include/asm-arm26/system.h | 1
include/asm-arm26/unistd.h | 10
include/asm-cris/arch-v10/io.h | 1
include/asm-cris/arch-v10/page.h | 1
include/asm-cris/arch-v10/system.h | 1
include/asm-cris/arch-v32/io.h | 1
include/asm-cris/arch-v32/irq.h | 1
include/asm-cris/arch-v32/page.h | 1
include/asm-cris/arch-v32/processor.h | 1
include/asm-cris/arch-v32/system.h | 1
include/asm-cris/eshlibld.h | 1
include/asm-cris/etraxgpio.h | 1
include/asm-cris/fasttimer.h | 1
include/asm-cris/page.h | 1
include/asm-cris/pci.h | 1
include/asm-cris/pgtable.h | 1
include/asm-cris/processor.h | 1
include/asm-cris/rtc.h | 1
include/asm-cris/tlbflush.h | 1
include/asm-cris/unistd.h | 9
include/asm-frv/atomic.h | 1
include/asm-frv/bitops.h | 1
include/asm-frv/bug.h | 1
include/asm-frv/cache.h | 1
include/asm-frv/dma.h | 1
include/asm-frv/elf.h | 1
include/asm-frv/fpu.h | 1
include/asm-frv/hardirq.h | 1
include/asm-frv/highmem.h | 1
include/asm-frv/ide.h | 1
include/asm-frv/io.h | 1
include/asm-frv/irq.h | 1
include/asm-frv/mmu_context.h | 1
include/asm-frv/page.h | 1
include/asm-frv/pci.h | 1
include/asm-frv/pgalloc.h | 1
include/asm-frv/pgtable.h | 1
include/asm-frv/processor.h | 1
include/asm-frv/segment.h | 1
include/asm-frv/serial.h | 1
include/asm-frv/smp.h | 1
include/asm-frv/system.h | 1
include/asm-frv/tlbflush.h | 1
include/asm-frv/types.h | 1
include/asm-frv/unaligned.h | 1
include/asm-frv/unistd.h | 7
include/asm-frv/virtconvert.h | 1
include/asm-generic/bug.h | 1
include/asm-generic/dma-mapping.h | 1
include/asm-generic/fcntl.h | 1
include/asm-generic/local.h | 1
include/asm-generic/signal.h | 7
include/asm-generic/tlb.h | 1
include/asm-h8300/bitops.h | 1
include/asm-h8300/dma.h | 1
include/asm-h8300/elf.h | 1
include/asm-h8300/hardirq.h | 1
include/asm-h8300/io.h | 1
include/asm-h8300/keyboard.h | 1
include/asm-h8300/mmu_context.h | 1
include/asm-h8300/page.h | 1
include/asm-h8300/page_offset.h | 1
include/asm-h8300/param.h | 1
include/asm-h8300/pgtable.h | 1
include/asm-h8300/processor.h | 1
include/asm-h8300/semaphore-helper.h | 1
include/asm-h8300/shm.h | 1
include/asm-h8300/system.h | 1
include/asm-h8300/unaligned.h | 1
include/asm-h8300/unistd.h | 7
include/asm-h8300/virtconvert.h | 1
include/asm-i386/apic.h | 1
include/asm-i386/atomic.h | 1
include/asm-i386/bitops.h | 1
include/asm-i386/bug.h | 1
include/asm-i386/bugs.h | 1
include/asm-i386/byteorder.h | 1
include/asm-i386/cache.h | 1
include/asm-i386/dma.h | 1
include/asm-i386/fixmap.h | 1
include/asm-i386/hardirq.h | 1
include/asm-i386/highmem.h | 1
include/asm-i386/hpet.h | 1
include/asm-i386/hw_irq.h | 1
include/asm-i386/ide.h | 1
include/asm-i386/io.h | 1
include/asm-i386/io_apic.h | 1
include/asm-i386/irq.h | 1
include/asm-i386/kmap_types.h | 1
include/asm-i386/mach-summit/mach_apic.h | 1
include/asm-i386/mmu_context.h | 1
include/asm-i386/mtrr.h | 1
include/asm-i386/page.h | 5
include/asm-i386/param.h | 1
include/asm-i386/pci.h | 1
include/asm-i386/pgalloc.h | 1
include/asm-i386/pgtable.h | 1
include/asm-i386/processor.h | 1
include/asm-i386/serial.h | 1
include/asm-i386/smp.h | 1
include/asm-i386/spinlock.h | 1
include/asm-i386/string.h | 1
include/asm-i386/system.h | 1
include/asm-i386/thread_info.h | 1
include/asm-i386/timex.h | 1
include/asm-i386/tlbflush.h | 1
include/asm-i386/types.h | 1
include/asm-i386/uaccess.h | 1
include/asm-i386/unistd.h | 7
include/asm-ia64/asmmacro.h | 1
include/asm-ia64/cache.h | 1
include/asm-ia64/delay.h | 1
include/asm-ia64/dma-mapping.h | 1
include/asm-ia64/dma.h | 1
include/asm-ia64/elf.h | 1
include/asm-ia64/hardirq.h | 1
include/asm-ia64/ia32.h | 1
include/asm-ia64/ide.h | 1
include/asm-ia64/intrinsics.h | 1
include/asm-ia64/kmap_types.h | 1
include/asm-ia64/machvec.h | 1
include/asm-ia64/meminit.h | 1
include/asm-ia64/nodedata.h | 1
include/asm-ia64/numa.h | 1
include/asm-ia64/page.h | 1
include/asm-ia64/param.h | 1
include/asm-ia64/percpu.h | 1
include/asm-ia64/pgalloc.h | 1
include/asm-ia64/pgtable.h | 1
include/asm-ia64/processor.h | 1
include/asm-ia64/ptrace.h | 1
include/asm-ia64/smp.h | 1
include/asm-ia64/sn/simulator.h | 1
include/asm-ia64/sn/sn_cpuid.h | 1
include/asm-ia64/sn/sn_sal.h | 1
include/asm-ia64/sn/xpc.h | 1
include/asm-ia64/string.h | 1
include/asm-ia64/system.h | 1
include/asm-ia64/tlb.h | 1
include/asm-ia64/tlbflush.h | 1
include/asm-ia64/unistd.h | 1
include/asm-m32r/assembler.h | 1
include/asm-m32r/atomic.h | 1
include/asm-m32r/bitops.h | 1
include/asm-m32r/cacheflush.h | 1
include/asm-m32r/hardirq.h | 1
include/asm-m32r/ide.h | 1
include/asm-m32r/irq.h | 1
include/asm-m32r/kmap_types.h | 1
include/asm-m32r/m32104ut/m32104ut_pld.h | 1
include/asm-m32r/m32700ut/m32700ut_lan.h | 1
include/asm-m32r/m32700ut/m32700ut_lcd.h | 1
include/asm-m32r/m32700ut/m32700ut_pld.h | 1
include/asm-m32r/m32r.h | 1
include/asm-m32r/mmu.h | 1
include/asm-m32r/mmu_context.h | 2
include/asm-m32r/opsput/opsput_lan.h | 1
include/asm-m32r/opsput/opsput_lcd.h | 1
include/asm-m32r/opsput/opsput_pld.h | 1
include/asm-m32r/page.h | 1
include/asm-m32r/pgalloc.h | 1
include/asm-m32r/pgtable-2level.h | 1
include/asm-m32r/pgtable.h | 1
include/asm-m32r/processor.h | 1
include/asm-m32r/ptrace.h | 1
include/asm-m32r/rtc.h | 1
include/asm-m32r/semaphore.h | 1
include/asm-m32r/serial.h | 1
include/asm-m32r/sigcontext.h | 1
include/asm-m32r/smp.h | 1
include/asm-m32r/spinlock.h | 1
include/asm-m32r/system.h | 1
include/asm-m32r/timex.h | 1
include/asm-m32r/tlbflush.h | 1
include/asm-m32r/uaccess.h | 1
include/asm-m32r/unistd.h | 5
include/asm-m68k/atomic.h | 1
include/asm-m68k/bug.h | 1
include/asm-m68k/dma-mapping.h | 1
include/asm-m68k/dma.h | 1
include/asm-m68k/dvma.h | 1
include/asm-m68k/elf.h | 1
include/asm-m68k/entry.h | 1
include/asm-m68k/fpu.h | 1
include/asm-m68k/hardirq.h | 1
include/asm-m68k/ide.h | 1
include/asm-m68k/io.h | 1
include/asm-m68k/irq.h | 1
include/asm-m68k/mc146818rtc.h | 1
include/asm-m68k/mmu_context.h | 1
include/asm-m68k/motorola_pgtable.h | 1
include/asm-m68k/openprom.h | 1
include/asm-m68k/page.h | 1
include/asm-m68k/page_offset.h | 1
include/asm-m68k/pgalloc.h | 1
include/asm-m68k/pgtable.h | 1
include/asm-m68k/processor.h | 1
include/asm-m68k/semaphore-helper.h | 1
include/asm-m68k/serial.h | 1
include/asm-m68k/setup.h | 1
include/asm-m68k/shm.h | 1
include/asm-m68k/system.h | 1
include/asm-m68k/tlbflush.h | 1
include/asm-m68k/unistd.h | 7
include/asm-m68k/virtconvert.h | 1
include/asm-m68knommu/bitops.h | 1
include/asm-m68knommu/coldfire.h | 1
include/asm-m68knommu/commproc.h | 1
include/asm-m68knommu/dma-mapping.h | 1
include/asm-m68knommu/dma.h | 1
include/asm-m68knommu/elf.h | 1
include/asm-m68knommu/elia.h | 1
include/asm-m68knommu/entry.h | 1
include/asm-m68knommu/fpu.h | 1
include/asm-m68knommu/hardirq.h | 1
include/asm-m68knommu/io.h | 1
include/asm-m68knommu/irq.h | 1
include/asm-m68knommu/m5206sim.h | 1
include/asm-m68knommu/m520xsim.h | 1
include/asm-m68knommu/m523xsim.h | 1
include/asm-m68knommu/m5272sim.h | 1
include/asm-m68knommu/m527xsim.h | 1
include/asm-m68knommu/m528xsim.h | 1
include/asm-m68knommu/mcfcache.h | 1
include/asm-m68knommu/mcfdma.h | 1
include/asm-m68knommu/mcfmbus.h | 1
include/asm-m68knommu/mcfne.h | 1
include/asm-m68knommu/mcfpci.h | 1
include/asm-m68knommu/mcfpit.h | 1
include/asm-m68knommu/mcfsim.h | 1
include/asm-m68knommu/mcfsmc.h | 1
include/asm-m68knommu/mcftimer.h | 1
include/asm-m68knommu/mcfuart.h | 1
include/asm-m68knommu/mcfwdebug.h | 1
include/asm-m68knommu/mmu_context.h | 1
include/asm-m68knommu/nettel.h | 1
include/asm-m68knommu/page.h | 1
include/asm-m68knommu/page_offset.h | 1
include/asm-m68knommu/param.h | 1
include/asm-m68knommu/pgtable.h | 1
include/asm-m68knommu/processor.h | 1
include/asm-m68knommu/semaphore-helper.h | 1
include/asm-m68knommu/system.h | 1
include/asm-m68knommu/unaligned.h | 1
include/asm-m68knommu/unistd.h | 7
include/asm-mips/a.out.h | 1
include/asm-mips/addrspace.h | 1
include/asm-mips/arc/types.h | 1
include/asm-mips/asm.h | 1
include/asm-mips/asmmacro.h | 1
include/asm-mips/atomic.h | 1
include/asm-mips/bcache.h | 1
include/asm-mips/bitops.h | 1
include/asm-mips/bug.h | 1
include/asm-mips/bugs.h | 1
include/asm-mips/byteorder.h | 1
include/asm-mips/cache.h | 1
include/asm-mips/checksum.h | 1
include/asm-mips/cpu-features.h | 1
include/asm-mips/cpu-info.h | 1
include/asm-mips/ddb5xxx/ddb5477.h | 1
include/asm-mips/ddb5xxx/ddb5xxx.h | 1
include/asm-mips/debug.h | 1
include/asm-mips/dec/prom.h | 1
include/asm-mips/delay.h | 1
include/asm-mips/dma.h | 1
include/asm-mips/elf.h | 1
include/asm-mips/fcntl.h | 1
include/asm-mips/fixmap.h | 1
include/asm-mips/fpu.h | 1
include/asm-mips/futex.h | 1
include/asm-mips/hazards.h | 1
include/asm-mips/highmem.h | 1
include/asm-mips/interrupt.h | 1
include/asm-mips/io.h | 1
include/asm-mips/ip32/machine.h | 1
include/asm-mips/irq.h | 1
include/asm-mips/isadep.h | 1
include/asm-mips/jmr3927/irq.h | 1
include/asm-mips/kmap_types.h | 1
include/asm-mips/local.h | 1
include/asm-mips/mach-au1x00/au1000.h | 1
include/asm-mips/mach-au1x00/au1xxx.h | 1
include/asm-mips/mach-au1x00/au1xxx_dbdma.h | 1
include/asm-mips/mach-au1x00/au1xxx_ide.h | 1
include/asm-mips/mach-au1x00/au1xxx_psc.h | 1
include/asm-mips/mach-au1x00/ioremap.h | 1
include/asm-mips/mach-cobalt/cpu-feature-overrides.h | 1
include/asm-mips/mach-db1x00/db1x00.h | 1
include/asm-mips/mach-generic/ide.h | 1
include/asm-mips/mach-generic/kmalloc.h | 1
include/asm-mips/mach-generic/spaces.h | 1
include/asm-mips/mach-ip22/spaces.h | 1
include/asm-mips/mach-ip32/cpu-feature-overrides.h | 1
include/asm-mips/mach-ip32/kmalloc.h | 1
include/asm-mips/mach-mips/cpu-feature-overrides.h | 1
include/asm-mips/mach-mips/irq.h | 1
include/asm-mips/mach-pb1x00/pb1550.h | 1
include/asm-mips/mach-sim/cpu-feature-overrides.h | 1
include/asm-mips/mips-boards/generic.h | 1
include/asm-mips/mipsregs.h | 1
include/asm-mips/mmu_context.h | 1
include/asm-mips/mmzone.h | 1
include/asm-mips/module.h | 1
include/asm-mips/msgbuf.h | 1
include/asm-mips/paccess.h | 1
include/asm-mips/page.h | 1
include/asm-mips/pci.h | 1
include/asm-mips/pgalloc.h | 1
include/asm-mips/pgtable-32.h | 1
include/asm-mips/pgtable-64.h | 1
include/asm-mips/pgtable-bits.h | 1
include/asm-mips/pgtable.h | 1
include/asm-mips/prefetch.h | 1
include/asm-mips/processor.h | 1
include/asm-mips/ptrace.h | 1
include/asm-mips/reg.h | 1
include/asm-mips/resource.h | 1
include/asm-mips/serial.h | 1
include/asm-mips/sgiarcs.h | 1
include/asm-mips/sibyte/board.h | 1
include/asm-mips/sibyte/carmel.h | 1
include/asm-mips/sibyte/sentosa.h | 1
include/asm-mips/sibyte/swarm.h | 1
include/asm-mips/siginfo.h | 1
include/asm-mips/signal.h | 1
include/asm-mips/sim.h | 1
include/asm-mips/smp.h | 1
include/asm-mips/sn/addrs.h | 1
include/asm-mips/sn/agent.h | 1
include/asm-mips/sn/arch.h | 1
include/asm-mips/sn/io.h | 1
include/asm-mips/sn/klconfig.h | 1
include/asm-mips/sn/kldir.h | 1
include/asm-mips/sn/launch.h | 1
include/asm-mips/sn/mapped_kernel.h | 1
include/asm-mips/sn/sn0/addrs.h | 1
include/asm-mips/sn/sn0/arch.h | 1
include/asm-mips/sn/sn0/hubmd.h | 1
include/asm-mips/stackframe.h | 1
include/asm-mips/string.h | 1
include/asm-mips/system.h | 1
include/asm-mips/thread_info.h | 1
include/asm-mips/tlbflush.h | 1
include/asm-mips/tx4927/toshiba_rbtx4927.h | 1
include/asm-mips/types.h | 1
include/asm-mips/uaccess.h | 1
include/asm-mips/unistd.h | 7
include/asm-mips/vr41xx/vrc4173.h | 1
include/asm-mips/war.h | 1
include/asm-mips/wbflush.h | 1
include/asm-parisc/atomic.h | 1
include/asm-parisc/cache.h | 1
include/asm-parisc/cacheflush.h | 1
include/asm-parisc/dma-mapping.h | 1
include/asm-parisc/dma.h | 1
include/asm-parisc/io.h | 1
include/asm-parisc/irq.h | 1
include/asm-parisc/kmap_types.h | 1
include/asm-parisc/page.h | 1
include/asm-parisc/param.h | 1
include/asm-parisc/pci.h | 1
include/asm-parisc/pdc.h | 1
include/asm-parisc/pgtable.h | 1
include/asm-parisc/processor.h | 1
include/asm-parisc/psw.h | 1
include/asm-parisc/smp.h | 1
include/asm-parisc/system.h | 1
include/asm-parisc/tlbflush.h | 1
include/asm-parisc/unistd.h | 4
include/asm-powerpc/abs_addr.h | 1
include/asm-powerpc/cache.h | 1
include/asm-powerpc/dma-mapping.h | 1
include/asm-powerpc/dma.h | 1
include/asm-powerpc/eeh.h | 1
include/asm-powerpc/elf.h | 9
include/asm-powerpc/floppy.h | 1
include/asm-powerpc/hw_irq.h | 1
include/asm-powerpc/ide.h | 1
include/asm-powerpc/iommu.h | 1
include/asm-powerpc/irq.h | 1
include/asm-powerpc/iseries/iseries_io.h | 1
include/asm-powerpc/machdep.h | 1
include/asm-powerpc/mmzone.h | 1
include/asm-powerpc/paca.h | 1
include/asm-powerpc/page.h | 1
include/asm-powerpc/pgtable.h | 1
include/asm-powerpc/ppc_asm.h | 1
include/asm-powerpc/prom.h | 1
include/asm-powerpc/smp.h | 1
include/asm-powerpc/smu.h | 1
include/asm-powerpc/spu.h | 1
include/asm-powerpc/thread_info.h | 1
include/asm-powerpc/time.h | 1
include/asm-powerpc/timex.h | 1
include/asm-powerpc/tlb.h | 1
include/asm-powerpc/tlbflush.h | 1
include/asm-powerpc/topology.h | 1
include/asm-powerpc/types.h | 1
include/asm-powerpc/unistd.h | 8
include/asm-powerpc/vga.h | 1
include/asm-powerpc/vio.h | 1
include/asm-ppc/amigahw.h | 1
include/asm-ppc/bootinfo.h | 1
include/asm-ppc/commproc.h | 1
include/asm-ppc/ibm403.h | 1
include/asm-ppc/ibm44x.h | 1
include/asm-ppc/ibm4xx.h | 1
include/asm-ppc/io.h | 1
include/asm-ppc/machdep.h | 1
include/asm-ppc/mmu.h | 1
include/asm-ppc/mmu_context.h | 1
include/asm-ppc/mpc8260.h | 1
include/asm-ppc/mpc83xx.h | 1
include/asm-ppc/mpc85xx.h | 1
include/asm-ppc/mpc8xx.h | 1
include/asm-ppc/mv64x60.h | 1
include/asm-ppc/ocp.h | 1
include/asm-ppc/open_pic.h | 1
include/asm-ppc/page.h | 2
include/asm-ppc/pc_serial.h | 1
include/asm-ppc/pgalloc.h | 1
include/asm-ppc/pgtable.h | 1
include/asm-ppc/ppc4xx_dma.h | 1
include/asm-ppc/ppc4xx_pic.h | 1
include/asm-ppc/serial.h | 1
include/asm-ppc/smp.h | 1
include/asm-ppc/time.h | 1
include/asm-s390/bitops.h | 1
include/asm-s390/cmb.h | 2
include/asm-s390/debug.h | 1
include/asm-s390/hardirq.h | 1
include/asm-s390/idals.h | 1
include/asm-s390/local.h | 1
include/asm-s390/lowcore.h | 1
include/asm-s390/page.h | 6
include/asm-s390/pgalloc.h | 1
include/asm-s390/ptrace.h | 6
include/asm-s390/sfp-machine.h | 1
include/asm-s390/smp.h | 1
include/asm-s390/system.h | 1
include/asm-s390/tlbflush.h | 1
include/asm-s390/types.h | 1
include/asm-s390/unistd.h | 8
include/asm-s390/vtoc.h | 38 +--
include/asm-s390/z90crypt.h | 212 +++++++++++++++++++
include/asm-sh/bug.h | 1
include/asm-sh/checksum.h | 1
include/asm-sh/dma-mapping.h | 1
include/asm-sh/dma.h | 1
include/asm-sh/fixmap.h | 1
include/asm-sh/hardirq.h | 1
include/asm-sh/hd64461/hd64461.h | 1
include/asm-sh/hd64465/hd64465.h | 1
include/asm-sh/ide.h | 1
include/asm-sh/io.h | 1
include/asm-sh/irq.h | 1
include/asm-sh/keyboard.h | 1
include/asm-sh/kmap_types.h | 1
include/asm-sh/machvec.h | 1
include/asm-sh/machvec_init.h | 1
include/asm-sh/mpc1211/dma.h | 1
include/asm-sh/overdrive/overdrive.h | 1
include/asm-sh/page.h | 1
include/asm-sh/pgtable.h | 1
include/asm-sh/serial.h | 1
include/asm-sh/smp.h | 1
include/asm-sh/system.h | 1
include/asm-sh/types.h | 1
include/asm-sh/unistd.h | 7
include/asm-sh/watchdog.h | 1
include/asm-sh64/bug.h | 1
include/asm-sh64/dma-mapping.h | 1
include/asm-sh64/hardirq.h | 1
include/asm-sh64/ide.h | 1
include/asm-sh64/irq.h | 1
include/asm-sh64/mmu_context.h | 1
include/asm-sh64/page.h | 1
include/asm-sh64/param.h | 1
include/asm-sh64/pgtable.h | 1
include/asm-sh64/system.h | 1
include/asm-sh64/unistd.h | 7
include/asm-sparc/asmmacro.h | 1
include/asm-sparc/atomic.h | 1
include/asm-sparc/bugs.h | 1
include/asm-sparc/cacheflush.h | 1
include/asm-sparc/delay.h | 1
include/asm-sparc/dma-mapping.h | 1
include/asm-sparc/dma.h | 1
include/asm-sparc/elf.h | 1
include/asm-sparc/fixmap.h | 1
include/asm-sparc/hardirq.h | 1
include/asm-sparc/ide.h | 1
include/asm-sparc/irq.h | 1
include/asm-sparc/mostek.h | 1
include/asm-sparc/page.h | 1
include/asm-sparc/pgalloc.h | 1
include/asm-sparc/pgtable.h | 1
include/asm-sparc/sfp-machine.h | 1
include/asm-sparc/smp.h | 1
include/asm-sparc/system.h | 2
include/asm-sparc/timer.h | 1
include/asm-sparc/tlbflush.h | 1
include/asm-sparc/unistd.h | 4
include/asm-sparc/vac-ops.h | 1
include/asm-sparc/winmacro.h | 1
include/asm-sparc64/atomic.h | 1
include/asm-sparc64/bitops.h | 1
include/asm-sparc64/bugs.h | 1
include/asm-sparc64/cacheflush.h | 1
include/asm-sparc64/delay.h | 1
include/asm-sparc64/dma-mapping.h | 1
include/asm-sparc64/dma.h | 1
include/asm-sparc64/floppy.h | 1
include/asm-sparc64/ide.h | 1
include/asm-sparc64/irq.h | 1
include/asm-sparc64/kprobes.h | 1
include/asm-sparc64/mc146818rtc.h | 1
include/asm-sparc64/mmu.h | 1
include/asm-sparc64/oplib.h | 1
include/asm-sparc64/page.h | 1
include/asm-sparc64/param.h | 1
include/asm-sparc64/pgalloc.h | 1
include/asm-sparc64/pgtable.h | 1
include/asm-sparc64/processor.h | 1
include/asm-sparc64/siginfo.h | 1
include/asm-sparc64/signal.h | 1
include/asm-sparc64/smp.h | 1
include/asm-sparc64/spinlock.h | 1
include/asm-sparc64/system.h | 1
include/asm-sparc64/timer.h | 1
include/asm-sparc64/tlb.h | 1
include/asm-sparc64/tlbflush.h | 1
include/asm-sparc64/ttable.h | 1
include/asm-sparc64/unistd.h | 4
include/asm-um/a.out.h | 1
include/asm-um/cache.h | 1
include/asm-um/elf-ppc.h | 1
include/asm-um/fixmap.h | 1
include/asm-um/hardirq.h | 1
include/asm-um/linkage.h | 1
include/asm-um/mmu_context.h | 1
include/asm-um/page.h | 1
include/asm-um/pgalloc.h | 1
include/asm-um/processor-generic.h | 1
include/asm-um/ptrace-generic.h | 1
include/asm-um/smp.h | 1
include/asm-um/thread_info.h | 1
include/asm-v850/atomic.h | 1
include/asm-v850/bitops.h | 1
include/asm-v850/dma-mapping.h | 1
include/asm-v850/hardirq.h | 1
include/asm-v850/machdep.h | 1
include/asm-v850/pgtable.h | 1
include/asm-v850/processor.h | 1
include/asm-v850/serial.h | 1
include/asm-v850/unistd.h | 12 -
include/asm-v850/v850e_uart.h | 1
include/asm-x86_64/apic.h | 1
include/asm-x86_64/atomic.h | 1
include/asm-x86_64/bitops.h | 1
include/asm-x86_64/bugs.h | 1
include/asm-x86_64/cache.h | 1
include/asm-x86_64/calling.h | 1
include/asm-x86_64/dma-mapping.h | 1
include/asm-x86_64/dma.h | 1
include/asm-x86_64/dwarf2.h | 1
include/asm-x86_64/fixmap.h | 1
include/asm-x86_64/hardirq.h | 1
include/asm-x86_64/hw_irq.h | 1
include/asm-x86_64/ia32.h | 1
include/asm-x86_64/io.h | 1
include/asm-x86_64/io_apic.h | 1
include/asm-x86_64/mmu_context.h | 1
include/asm-x86_64/mmzone.h | 1
include/asm-x86_64/mtrr.h | 9
include/asm-x86_64/page.h | 5
include/asm-x86_64/param.h | 1
include/asm-x86_64/pci.h | 1
include/asm-x86_64/processor.h | 1
include/asm-x86_64/serial.h | 1
include/asm-x86_64/smp.h | 1
include/asm-x86_64/spinlock.h | 1
include/asm-x86_64/swiotlb.h | 1
include/asm-x86_64/system.h | 1
include/asm-x86_64/tlbflush.h | 1
include/asm-x86_64/topology.h | 1
include/asm-x86_64/uaccess.h | 1
include/asm-x86_64/unistd.h | 7
include/asm-xtensa/atomic.h | 1
include/asm-xtensa/checksum.h | 1
include/asm-xtensa/delay.h | 1
include/asm-xtensa/dma.h | 1
include/asm-xtensa/hardirq.h | 1
include/asm-xtensa/ide.h | 1
include/asm-xtensa/io.h | 1
include/asm-xtensa/irq.h | 1
include/asm-xtensa/mmu_context.h | 1
include/asm-xtensa/page.h | 1
include/asm-xtensa/pgalloc.h | 1
include/asm-xtensa/platform.h | 1
include/asm-xtensa/system.h | 1
include/asm-xtensa/unistd.h | 21 -
include/linux/acct.h | 3
include/linux/acpi.h | 1
include/linux/affs_hardblocks.h | 72 +++---
include/linux/agpgart.h | 3
include/linux/amba/clcd.h | 1
include/linux/atmdev.h | 1
include/linux/audit.h | 4
include/linux/blkdev.h | 1
include/linux/blkpg.h | 1
include/linux/blktrace_api.h | 1
include/linux/blockgroup_lock.h | 1
include/linux/cache.h | 1
include/linux/coda.h | 1
include/linux/compat.h | 1
include/linux/compiler.h | 19 -
include/linux/cpufreq.h | 1
include/linux/cramfs_fs.h | 34 +--
include/linux/crypto.h | 1
include/linux/cyclomx.h | 1
include/linux/dcookies.h | 1
include/linux/devfs_fs_kernel.h | 1
include/linux/device.h | 1
include/linux/divert.h | 20 -
include/linux/dmi.h | 1
include/linux/dnotify.h | 1
include/linux/elf-em.h | 44 +++
include/linux/elf.h | 59 -----
include/linux/errqueue.h | 1
include/linux/ethtool.h | 169 +++++++--------
include/linux/ext2_fs.h | 2
include/linux/ext3_fs.h | 10
include/linux/fs.h | 1
include/linux/ftape.h | 1
include/linux/gameport.h | 6
include/linux/generic_serial.h | 6
include/linux/genhd.h | 12 -
include/linux/gfp.h | 1
include/linux/hardirq.h | 1
include/linux/highmem.h | 1
include/linux/highuid.h | 1
include/linux/i2c-algo-ite.h | 7
include/linux/i2c.h | 9
include/linux/i2o-dev.h | 167 +++++++-------
include/linux/ide.h | 1
include/linux/if_fddi.h | 2
include/linux/if_frad.h | 1
include/linux/if_tr.h | 1
include/linux/init.h | 1
include/linux/inotify.h | 1
include/linux/input.h | 1
include/linux/interrupt.h | 1
include/linux/ipmi.h | 2
include/linux/ipv6.h | 1
include/linux/irq.h | 1
include/linux/irq_cpustat.h | 1
include/linux/isapnp.h | 1
include/linux/isdn.h | 1
include/linux/isdn/tpam.h | 1
include/linux/isdn_ppp.h | 1
include/linux/isdnif.h | 1
include/linux/joystick.h | 22 -
include/linux/kallsyms.h | 1
include/linux/kernel_stat.h | 1
include/linux/kmod.h | 1
include/linux/kprobes.h | 1
include/linux/linkage.h | 1
include/linux/lockd/lockd.h | 1
include/linux/lockd/nlm.h | 1
include/linux/mempolicy.h | 1
include/linux/migrate.h | 1
include/linux/mii.h | 30 +-
include/linux/mm.h | 1
include/linux/mman.h | 12 -
include/linux/mmzone.h | 1
include/linux/module.h | 1
include/linux/msg.h | 2
include/linux/mtd/cfi.h | 1
include/linux/mtd/map.h | 1
include/linux/mtd/mtd.h | 1
include/linux/mtd/nand.h | 1
include/linux/mtd/physmap.h | 1
include/linux/mtd/xip.h | 1
include/linux/nbd.h | 12 -
include/linux/ncp_fs.h | 5
include/linux/net.h | 3
include/linux/netdevice.h | 1
include/linux/netfilter.h | 1
include/linux/netfilter/xt_conntrack.h | 2
include/linux/netfilter_arp.h | 1
include/linux/netfilter_bridge.h | 1
include/linux/netfilter_ipv4.h | 1
include/linux/netfilter_ipv4/ip_conntrack.h | 1
include/linux/netfilter_ipv4/listhelp.h | 1
include/linux/nfs.h | 8
include/linux/nfs4.h | 6
include/linux/nfs_fs.h | 39 +--
include/linux/nfsd/nfsd.h | 1
include/linux/nfsd/nfsfh.h | 1
include/linux/nfsd/syscall.h | 1
include/linux/numa.h | 1
include/linux/parport.h | 1
include/linux/pci.h | 5
include/linux/percpu_counter.h | 1
include/linux/pm.h | 1
include/linux/pm_legacy.h | 1
include/linux/pmu.h | 1
include/linux/ppp_defs.h | 14 -
include/linux/preempt.h | 1
include/linux/proc_fs.h | 1
include/linux/profile.h | 1
include/linux/quota.h | 4
include/linux/quotaops.h | 1
include/linux/reiserfs_xattr.h | 3
include/linux/relay.h | 1
include/linux/rio.h | 1
include/linux/rio_drv.h | 1
include/linux/rmap.h | 1
include/linux/rtnetlink.h | 1
include/linux/rwsem.h | 1
include/linux/scc.h | 1
include/linux/sched.h | 94 ++++----
include/linux/seccomp.h | 1
include/linux/sem.h | 2
include/linux/seqlock.h | 1
include/linux/serialP.h | 1
include/linux/serial_core.h | 1
include/linux/signal.h | 4
include/linux/skbuff.h | 1
include/linux/slab.h | 1
include/linux/smb_fs.h | 4
include/linux/smp.h | 1
include/linux/smp_lock.h | 1
include/linux/socket.h | 2
include/linux/spinlock.h | 1
include/linux/stop_machine.h | 1
include/linux/sunrpc/auth.h | 1
include/linux/sunrpc/debug.h | 24 --
include/linux/sunrpc/stats.h | 1
include/linux/suspend.h | 1
include/linux/swap.h | 1
include/linux/syscalls.h | 1
include/linux/sysrq.h | 1
include/linux/tcp.h | 1
include/linux/threads.h | 1
include/linux/timer.h | 1
include/linux/timex.h | 1
include/linux/tty.h | 1
include/linux/types.h | 1
include/linux/udp.h | 1
include/linux/ufs_fs.h | 1
include/linux/unistd.h | 2
include/linux/usb.h | 1
include/linux/usb_usual.h | 1
include/linux/usbdevice_fs.h | 2
include/linux/vt_buffer.h | 1
include/linux/vt_kern.h | 1
include/linux/wait.h | 1
include/linux/wanrouter.h | 4
include/mtd/mtd-abi.h | 5
include/net/addrconf.h | 1
include/net/af_unix.h | 1
include/net/ax25.h | 1
include/net/compat.h | 1
include/net/dst.h | 1
include/net/icmp.h | 1
include/net/inet6_hashtables.h | 1
include/net/inet_hashtables.h | 1
include/net/inet_sock.h | 1
include/net/inet_timewait_sock.h | 1
include/net/ip.h | 1
include/net/ip_fib.h | 1
include/net/ip_mp_alg.h | 1
include/net/ip_vs.h | 1
include/net/ipv6.h | 1
include/net/irda/irda.h | 1
include/net/irda/irda_device.h | 1
include/net/irda/irlap.h | 1
include/net/irda/irlmp.h | 1
include/net/irda/irlmp_frame.h | 1
include/net/irda/qos.h | 1
include/net/ndisc.h | 1
include/net/netfilter/nf_conntrack.h | 1
include/net/pkt_act.h | 1
include/net/protocol.h | 1
include/net/raw.h | 1
include/net/red.h | 1
include/net/route.h | 1
include/net/sch_generic.h | 1
include/net/sctp/sctp.h | 1
include/net/sock.h | 1
include/net/tcp.h | 1
include/pcmcia/ss.h | 1
include/scsi/scsi_transport_fc.h | 1
include/scsi/scsi_transport_spi.h | 1
include/sound/driver.h | 1
include/sound/hdsp.h | 12 -
include/video/edid.h | 1
include/video/vga.h | 1
905 files changed, 816 insertions(+), 1635 deletions(-)
Index: linux-2.6-header-cleanup-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-header-cleanup-git.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- linux-2.6-header-cleanup-git.patch 27 May 2006 11:06:07 -0000 1.19
+++ linux-2.6-header-cleanup-git.patch 9 Jun 2006 17:12:12 -0000 1.20
@@ -11334,6 +11334,18 @@
#ifdef CONFIG_INOTIFY
+diff --git a/include/linux/input.h b/include/linux/input.h
+index 50e338d..b48d987 100644
+--- a/include/linux/input.h
++++ b/include/linux/input.h
+@@ -15,6 +15,7 @@ #include <linux/list.h>
+ #else
+ #include <sys/time.h>
+ #include <sys/ioctl.h>
++#include <sys/types.h>
+ #include <asm/types.h>
+ #endif
+
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 2c08fdc..9e0fefd 100644
--- a/include/linux/interrupt.h
@@ -11462,6 +11474,47 @@
#include <linux/skbuff.h>
/***************************************************************************/
+diff --git a/include/linux/joystick.h b/include/linux/joystick.h
+index 5fd20dd..e2d3a18 100644
+--- a/include/linux/joystick.h
++++ b/include/linux/joystick.h
+@@ -111,25 +111,25 @@ #define JS_GET_ALL 7
+ #define JS_SET_ALL 8
+
+ struct JS_DATA_TYPE {
+- int32_t buttons;
+- int32_t x;
+- int32_t y;
++ __s32 buttons;
++ __s32 x;
++ __s32 y;
+ };
+
+ struct JS_DATA_SAVE_TYPE_32 {
+- int32_t JS_TIMEOUT;
+- int32_t BUSY;
+- int32_t JS_EXPIRETIME;
+- int32_t JS_TIMELIMIT;
++ __s32 JS_TIMEOUT;
++ __s32 BUSY;
++ __s32 JS_EXPIRETIME;
++ __s32 JS_TIMELIMIT;
+ struct JS_DATA_TYPE JS_SAVE;
+ struct JS_DATA_TYPE JS_CORR;
+ };
+
+ struct JS_DATA_SAVE_TYPE_64 {
+- int32_t JS_TIMEOUT;
+- int32_t BUSY;
+- int64_t JS_EXPIRETIME;
+- int64_t JS_TIMELIMIT;
++ __s32 JS_TIMEOUT;
++ __s32 BUSY;
++ __s64 JS_EXPIRETIME;
++ __s64 JS_TIMELIMIT;
+ struct JS_DATA_TYPE JS_SAVE;
+ struct JS_DATA_TYPE JS_CORR;
+ };
diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
index 9bbd040..54e2549 100644
--- a/include/linux/kallsyms.h
More information about the fedora-cvs-commits
mailing list