History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

David S. Miller committed 7 years ago

Commit 310655b2 parents 7f301cf 869e330146 files · +1478 −1109Browse files

Showing the changes to include/linux (6 of 146 files). Show all

Unified · Split

6 files
  1. include/linux/bitrev.h +23 −23
  2. include/linux/fs.h +4 −0
  3. include/linux/memcontrol.h +4 −1
  4. include/linux/mm_types.h +1 −1
  5. include/linux/ptrace.h +8 −3
  6. include/linux/string.h +3 −0
include/linux/bitrev.h+23−23
@@ -34,41 +34,41 @@ static inline u32 __bitrev32(u32 x) · 33 unmodified lines
3434
3535 #define __constant_bitrev32(x) \
3636 ({ \
37− u32 __x = x; \
38− __x = (__x >> 16) | (__x << 16); \
39− __x = ((__x & (u32)0xFF00FF00UL) >> 8) | ((__x & (u32)0x00FF00FFUL) << 8); \
40− __x = ((__x & (u32)0xF0F0F0F0UL) >> 4) | ((__x & (u32)0x0F0F0F0FUL) << 4); \
41− __x = ((__x & (u32)0xCCCCCCCCUL) >> 2) | ((__x & (u32)0x33333333UL) << 2); \
42− __x = ((__x & (u32)0xAAAAAAAAUL) >> 1) | ((__x & (u32)0x55555555UL) << 1); \
43− __x; \
37+ u32 ___x = x; \
38+ ___x = (___x >> 16) | (___x << 16); \
39+ ___x = ((___x & (u32)0xFF00FF00UL) >> 8) | ((___x & (u32)0x00FF00FFUL) << 8); \
40+ ___x = ((___x & (u32)0xF0F0F0F0UL) >> 4) | ((___x & (u32)0x0F0F0F0FUL) << 4); \
41+ ___x = ((___x & (u32)0xCCCCCCCCUL) >> 2) | ((___x & (u32)0x33333333UL) << 2); \
42+ ___x = ((___x & (u32)0xAAAAAAAAUL) >> 1) | ((___x & (u32)0x55555555UL) << 1); \
43+ ___x; \
4444 })
4545
4646 #define __constant_bitrev16(x) \
4747 ({ \
48− u16 __x = x; \
49− __x = (__x >> 8) | (__x << 8); \
50− __x = ((__x & (u16)0xF0F0U) >> 4) | ((__x & (u16)0x0F0FU) << 4); \
51− __x = ((__x & (u16)0xCCCCU) >> 2) | ((__x & (u16)0x3333U) << 2); \
52− __x = ((__x & (u16)0xAAAAU) >> 1) | ((__x & (u16)0x5555U) << 1); \
53− __x; \
48+ u16 ___x = x; \
49+ ___x = (___x >> 8) | (___x << 8); \
50+ ___x = ((___x & (u16)0xF0F0U) >> 4) | ((___x & (u16)0x0F0FU) << 4); \
51+ ___x = ((___x & (u16)0xCCCCU) >> 2) | ((___x & (u16)0x3333U) << 2); \
52+ ___x = ((___x & (u16)0xAAAAU) >> 1) | ((___x & (u16)0x5555U) << 1); \
53+ ___x; \
5454 })
5555
5656 #define __constant_bitrev8x4(x) \
5757 ({ \
58− u32 __x = x; \
59− __x = ((__x & (u32)0xF0F0F0F0UL) >> 4) | ((__x & (u32)0x0F0F0F0FUL) << 4); \
60− __x = ((__x & (u32)0xCCCCCCCCUL) >> 2) | ((__x & (u32)0x33333333UL) << 2); \
61− __x = ((__x & (u32)0xAAAAAAAAUL) >> 1) | ((__x & (u32)0x55555555UL) << 1); \
62− __x; \
58+ u32 ___x = x; \
59+ ___x = ((___x & (u32)0xF0F0F0F0UL) >> 4) | ((___x & (u32)0x0F0F0F0FUL) << 4); \
60+ ___x = ((___x & (u32)0xCCCCCCCCUL) >> 2) | ((___x & (u32)0x33333333UL) << 2); \
61+ ___x = ((___x & (u32)0xAAAAAAAAUL) >> 1) | ((___x & (u32)0x55555555UL) << 1); \
62+ ___x; \
6363 })
6464
6565 #define __constant_bitrev8(x) \
6666 ({ \
67− u8 __x = x; \
68− __x = (__x >> 4) | (__x << 4); \
69− __x = ((__x & (u8)0xCCU) >> 2) | ((__x & (u8)0x33U) << 2); \
70− __x = ((__x & (u8)0xAAU) >> 1) | ((__x & (u8)0x55U) << 1); \
71− __x; \
67+ u8 ___x = x; \
68+ ___x = (___x >> 4) | (___x << 4); \
69+ ___x = ((___x & (u8)0xCCU) >> 2) | ((___x & (u8)0x33U) << 2); \
70+ ___x = ((___x & (u8)0xAAU) >> 1) | ((___x & (u8)0x55U) << 1); \
71+ ___x; \
7272 })
7373
7474 #define bitrev32(x) \
include/linux/fs.h+4−0
@@ -158,6 +158,9 @@ typedef int (dio_iodone_t)(struct kiocb *iocb, loff_t offset, · 157 unmodified lines
158158 #define FMODE_OPENED ((__force fmode_t)0x80000)
159159 #define FMODE_CREATED ((__force fmode_t)0x100000)
160160
161+/* File is stream-like */
162+#define FMODE_STREAM ((__force fmode_t)0x200000)
163+
161164 /* File was opened by fanotify and shouldn't generate fanotify events */
162165 #define FMODE_NONOTIFY ((__force fmode_t)0x4000000)
163166
@@ -3074,6 +3077,7 @@ extern loff_t no_seek_end_llseek_size(struct file *, loff_t, int, loff_t); · 2910 unmodified lines
30743077 extern loff_t no_seek_end_llseek(struct file *, loff_t, int);
30753078 extern int generic_file_open(struct inode * inode, struct file * filp);
30763079 extern int nonseekable_open(struct inode * inode, struct file * filp);
3080+extern int stream_open(struct inode * inode, struct file * filp);
30773081
30783082 #ifdef CONFIG_BLOCK
30793083 typedef void (dio_submit_t)(struct bio *bio, struct inode *inode,
include/linux/memcontrol.h+4−1
@@ -566,7 +566,10 @@ struct mem_cgroup *lock_page_memcg(struct page *page); · 565 unmodified lines
566566 void __unlock_page_memcg(struct mem_cgroup *memcg);
567567 void unlock_page_memcg(struct page *page);
568568
569−/* idx can be of type enum memcg_stat_item or node_stat_item */
569+/*
570+ * idx can be of type enum memcg_stat_item or node_stat_item.
571+ * Keep in sync with memcg_exact_page_state().
572+ */
570573 static inline unsigned long memcg_page_state(struct mem_cgroup *memcg,
571574 int idx)
572575 {
include/linux/mm_types.h+1−1
@@ -671,7 +671,7 @@ enum vm_fault_reason { · 670 unmodified lines
671671
672672 /* Encode hstate index for a hwpoisoned large page */
673673 #define VM_FAULT_SET_HINDEX(x) ((__force vm_fault_t)((x) << 16))
674−#define VM_FAULT_GET_HINDEX(x) (((x) >> 16) & 0xf)
674+#define VM_FAULT_GET_HINDEX(x) (((__force unsigned int)(x) >> 16) & 0xf)
675675
676676 #define VM_FAULT_ERROR (VM_FAULT_OOM | VM_FAULT_SIGBUS | \
677677 VM_FAULT_SIGSEGV | VM_FAULT_HWPOISON | \
include/linux/ptrace.h+8−3
@@ -9,6 +9,13 @@ · 8 unmodified lines
99 #include <linux/bug.h> /* For BUG_ON. */
1010 #include <linux/pid_namespace.h> /* For task_active_pid_ns. */
1111 #include <uapi/linux/ptrace.h>
12+#include <linux/seccomp.h>
13+
14+/* Add sp to seccomp_data, as seccomp is user API, we don't want to modify it */
15+struct syscall_info {
16+ __u64 sp;
17+ struct seccomp_data data;
18+};
1219
1320 extern int ptrace_access_vm(struct task_struct *tsk, unsigned long addr,
1421 void *buf, int len, unsigned int gup_flags);
@@ -407,9 +414,7 @@ static inline void user_single_step_report(struct pt_regs *regs) · 392 unmodified lines
407414 #define current_user_stack_pointer() user_stack_pointer(current_pt_regs())
408415 #endif
409416
410−extern int task_current_syscall(struct task_struct *target, long *callno,
411− unsigned long args[6], unsigned int maxargs,
412− unsigned long *sp, unsigned long *pc);
417+extern int task_current_syscall(struct task_struct *target, struct syscall_info *info);
413418
414419 extern void sigaction_compat_abi(struct k_sigaction *act, struct k_sigaction *oact);
415420 #endif
include/linux/string.h+3−0
@@ -150,6 +150,9 @@ extern void * memscan(void *,int,__kernel_size_t); · 149 unmodified lines
150150 #ifndef __HAVE_ARCH_MEMCMP
151151 extern int memcmp(const void *,const void *,__kernel_size_t);
152152 #endif
153+#ifndef __HAVE_ARCH_BCMP
154+extern int bcmp(const void *,const void *,__kernel_size_t);
155+#endif
153156 #ifndef __HAVE_ARCH_MEMCHR
154157 extern void * memchr(const void *,int,__kernel_size_t);
155158 #endif

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t