History

Merge branch 'akpm' (incoming from Andrew)

Merge second patch-bomb from Andrew Morton: - various misc bits - the rest of MM - add generic fixmap.h, use it - backlight updates - dynamic_debug updates - printk() updates - checkpatch updates - binfmt_elf - ramfs - init/ - autofs4 - drivers/rtc - nilfs - hfsplus - Documentation/ - coredump - procfs - fork - exec - kexec - kdump - partitions - rapidio - rbtree - userns - memstick - w1 - decompressors * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (197 commits) lib/decompress_unlz4.c: always set an error return code on failures romfs: fix returm err while getting inode in fill_super drivers/w1/masters/w1-gpio.c: add strong pullup emulation drivers/memstick/host/rtsx_pci_ms.c: fix ms card data transfer bug userns: relax the posix_acl_valid() checks arch/sh/kernel/dwarf.c: use rbtree postorder iteration helper instead of solution using repeated rb_erase() fs-ext3-use-rbtree-postorder-iteration-helper-instead-of-opencoding-fix fs/ext3: use rbtree postorder iteration helper instead of opencoding fs/jffs2: use rbtree postorder iteration helper instead of opencoding fs/ext4: use rbtree postorder iteration helper instead of opencoding fs/ubifs: use rbtree postorder iteration helper instead of opencoding net/netfilter/ipset/ip_set_hash_netiface.c: use rbtree postorder iteration instead of opencoding rbtree/test: test rbtree_postorder_for_each_entry_safe() rbtree/test: move rb_node to the middle of the test struct rapidio: add modular rapidio core build into powerpc and mips branches partitions/efi: complete documentation of gpt kernel param purpose kdump: add /sys/kernel/vmcoreinfo ABI documentation kdump: fix exported size of vmcoreinfo note kexec: add sysctl to disable kexec_load fs/exec.c: call arch_pick_mmap_layout() only once ...

Linus Torvalds committed 12 years ago

Commit 3aacd622 parents 7e21774 2a1d689231 files · +3339 −2187Browse files

Showing the changes to include/uapi (5 of 231 files). Show all

Unified · Split

5 files
  1. include/uapi/asm-generic/types.h +1 −2
  2. include/uapi/linux/dn.h +1 −0
  3. include/uapi/linux/nfs4.h +1 −1
  4. include/uapi/linux/perf_event.h +1 −1
  5. include/uapi/linux/ppp-ioctl.h +1 −0
include/uapi/asm-generic/types.h+1−2
@@ -1,8 +1,7 @@
1#ifndef _ASM_GENERIC_TYPES_H1#ifndef _ASM_GENERIC_TYPES_H
2#define _ASM_GENERIC_TYPES_H2#define _ASM_GENERIC_TYPES_H
3/*3/*
4 * int-ll64 is used practically everywhere now,4 * int-ll64 is used everywhere now.
5 * so use it as a reasonable default.
6 */5 */
7#include <asm-generic/int-ll64.h>6#include <asm-generic/int-ll64.h>
8 7
include/uapi/linux/dn.h+1−0
@@ -1,6 +1,7 @@
1#ifndef _LINUX_DN_H1#ifndef _LINUX_DN_H
2#define _LINUX_DN_H2#define _LINUX_DN_H
3 3
4#include <linux/ioctl.h>
4#include <linux/types.h>5#include <linux/types.h>
5#include <linux/if_ether.h>6#include <linux/if_ether.h>
6 7
include/uapi/linux/nfs4.h+1−1
@@ -150,7 +150,7 @@ · 149 unmodified lines
150#define NFS4_SECINFO_STYLE4_CURRENT_FH 0150#define NFS4_SECINFO_STYLE4_CURRENT_FH 0
151#define NFS4_SECINFO_STYLE4_PARENT 1151#define NFS4_SECINFO_STYLE4_PARENT 1
152 152
153#define NFS4_MAX_UINT64 (~(u64)0)153#define NFS4_MAX_UINT64 (~(__u64)0)
154 154
155/* An NFS4 sessions server must support at least NFS4_MAX_OPS operations.155/* An NFS4 sessions server must support at least NFS4_MAX_OPS operations.
156 * If a compound requires more operations, adjust NFS4_MAX_OPS accordingly.156 * If a compound requires more operations, adjust NFS4_MAX_OPS accordingly.
include/uapi/linux/perf_event.h+1−1
@@ -788,7 +788,7 @@ union perf_mem_data_src { · 787 unmodified lines
788#define PERF_MEM_TLB_SHIFT 26788#define PERF_MEM_TLB_SHIFT 26
789 789
790#define PERF_MEM_S(a, s) \790#define PERF_MEM_S(a, s) \
791 (((u64)PERF_MEM_##a##_##s) << PERF_MEM_##a##_SHIFT)791 (((__u64)PERF_MEM_##a##_##s) << PERF_MEM_##a##_SHIFT)
792 792
793/*793/*
794 * single taken branch record layout:794 * single taken branch record layout:
include/uapi/linux/ppp-ioctl.h+1−0
@@ -12,6 +12,7 @@ · 11 unmodified lines
12 12
13#include <linux/types.h>13#include <linux/types.h>
14#include <linux/compiler.h>14#include <linux/compiler.h>
15#include <linux/ppp_defs.h>
15 16
16/*17/*
17 * Bit definitions for flags argument to PPPIOCGFLAGS/PPPIOCSFLAGS.18 * Bit definitions for flags argument to PPPIOCGFLAGS/PPPIOCSFLAGS.