diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-08 15:19:57 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-08 15:19:57 -0500 |
| commit | 972b2c719990f91eb3b2310d44ef8a2d38955a14 (patch) | |
| tree | b25a250ec5bec4b7b6355d214642d8b57c5cab32 /arch/ia64 | |
| parent | 02550d61f49266930e674286379d3601006b2893 (diff) | |
| parent | c3aa077648e147783a7a53b409578234647db853 (diff) | |
Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
* 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (165 commits)
reiserfs: Properly display mount options in /proc/mounts
vfs: prevent remount read-only if pending removes
vfs: count unlinked inodes
vfs: protect remounting superblock read-only
vfs: keep list of mounts for each superblock
vfs: switch ->show_options() to struct dentry *
vfs: switch ->show_path() to struct dentry *
vfs: switch ->show_devname() to struct dentry *
vfs: switch ->show_stats to struct dentry *
switch security_path_chmod() to struct path *
vfs: prefer ->dentry->d_sb to ->mnt->mnt_sb
vfs: trim includes a bit
switch mnt_namespace ->root to struct mount
vfs: take /proc/*/mounts and friends to fs/proc_namespace.c
vfs: opencode mntget() mnt_set_mountpoint()
vfs: spread struct mount - remaining argument of next_mnt()
vfs: move fsnotify junk to struct mount
vfs: move mnt_devname
vfs: move mnt_list to struct mount
vfs: switch pnode.h macros to struct mount *
...
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/include/asm/ipcbuf.h | 29 | ||||
| -rw-r--r-- | arch/ia64/include/asm/types.h | 2 | ||||
| -rw-r--r-- | arch/ia64/kernel/perfmon.c | 2 |
3 files changed, 2 insertions, 31 deletions
diff --git a/arch/ia64/include/asm/ipcbuf.h b/arch/ia64/include/asm/ipcbuf.h index 079899ae7d32..84c7e51cb6d0 100644 --- a/arch/ia64/include/asm/ipcbuf.h +++ b/arch/ia64/include/asm/ipcbuf.h | |||
| @@ -1,28 +1 @@ | |||
| 1 | #ifndef _ASM_IA64_IPCBUF_H | #include <asm-generic/ipcbuf.h> | |
| 2 | #define _ASM_IA64_IPCBUF_H | ||
| 3 | |||
| 4 | /* | ||
| 5 | * The ipc64_perm structure for IA-64 architecture. | ||
| 6 | * Note extra padding because this structure is passed back and forth | ||
| 7 | * between kernel and user space. | ||
| 8 | * | ||
| 9 | * Pad space is left for: | ||
| 10 | * - 32-bit seq | ||
| 11 | * - 2 miscellaneous 64-bit values | ||
| 12 | */ | ||
| 13 | |||
| 14 | struct ipc64_perm | ||
| 15 | { | ||
| 16 | __kernel_key_t key; | ||
| 17 | __kernel_uid_t uid; | ||
| 18 | __kernel_gid_t gid; | ||
| 19 | __kernel_uid_t cuid; | ||
| 20 | __kernel_gid_t cgid; | ||
| 21 | __kernel_mode_t mode; | ||
| 22 | unsigned short seq; | ||
| 23 | unsigned short __pad1; | ||
| 24 | unsigned long __unused1; | ||
| 25 | unsigned long __unused2; | ||
| 26 | }; | ||
| 27 | |||
| 28 | #endif /* _ASM_IA64_IPCBUF_H */ | ||
diff --git a/arch/ia64/include/asm/types.h b/arch/ia64/include/asm/types.h index 82b3939d2718..3f5b122d9975 100644 --- a/arch/ia64/include/asm/types.h +++ b/arch/ia64/include/asm/types.h | |||
| @@ -28,8 +28,6 @@ | |||
| 28 | # define __IA64_UL(x) ((unsigned long)(x)) | 28 | # define __IA64_UL(x) ((unsigned long)(x)) |
| 29 | # define __IA64_UL_CONST(x) x##UL | 29 | # define __IA64_UL_CONST(x) x##UL |
| 30 | 30 | ||
| 31 | typedef unsigned int umode_t; | ||
| 32 | |||
| 33 | /* | 31 | /* |
| 34 | * These aren't exported outside the kernel to avoid name space clashes | 32 | * These aren't exported outside the kernel to avoid name space clashes |
| 35 | */ | 33 | */ |
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index 89accc626b86..b2c65e034f5d 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c | |||
| @@ -2228,7 +2228,7 @@ pfm_alloc_file(pfm_context_t *ctx) | |||
| 2228 | /* | 2228 | /* |
| 2229 | * allocate a new dcache entry | 2229 | * allocate a new dcache entry |
| 2230 | */ | 2230 | */ |
| 2231 | path.dentry = d_alloc(pfmfs_mnt->mnt_sb->s_root, &this); | 2231 | path.dentry = d_alloc(pfmfs_mnt->mnt_root, &this); |
| 2232 | if (!path.dentry) { | 2232 | if (!path.dentry) { |
| 2233 | iput(inode); | 2233 | iput(inode); |
| 2234 | return ERR_PTR(-ENOMEM); | 2234 | return ERR_PTR(-ENOMEM); |