History

Merge branch 'akpm' (patches from Andrew Morton)

Merge misc fixes from Andrew Morton: "Six fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: drivers/rtc/rtc-s5m.c: terminate s5m_rtc_id array with empty element printk: add dummy routine for when CONFIG_PRINTK=n mm/vmscan: fix highidx argument type memcg: remove extra newlines from memcg oom kill log x86, build: replace Perl script with Shell script mm: page_alloc: embed OOM killing naturally into allocation slowpath

Linus Torvalds committed 11 years ago

Commit 4adca1c2 parents c976a67 45cd15e9 files · +94 −98Browse files

Showing the changes to include (2 of 9 files). Show all

Unified · Split

2 files
  1. include/linux/oom.h +0 −5
  2. include/linux/printk.h +12 −3
include/linux/oom.h+0−5
@@ -85,11 +85,6 @@ static inline void oom_killer_enable(void) · 84 unmodified lines
85 oom_killer_disabled = false;85 oom_killer_disabled = false;
86}86}
87 87
88static inline bool oom_gfp_allowed(gfp_t gfp_mask)
89{
90 return (gfp_mask & __GFP_FS) && !(gfp_mask & __GFP_NORETRY);
91}
92
93extern struct task_struct *find_lock_task_mm(struct task_struct *p);88extern struct task_struct *find_lock_task_mm(struct task_struct *p);
94 89
95static inline bool task_will_free_mem(struct task_struct *task)90static inline bool task_will_free_mem(struct task_struct *task)
include/linux/printk.h+12−3
@@ -10,9 +10,6 @@ · 9 unmodified lines
10extern const char linux_banner[];10extern const char linux_banner[];
11extern const char linux_proc_banner[];11extern const char linux_proc_banner[];
12 12
13extern char *log_buf_addr_get(void);
14extern u32 log_buf_len_get(void);
15
16static inline int printk_get_level(const char *buffer)13static inline int printk_get_level(const char *buffer)
17{14{
18 if (buffer[0] == KERN_SOH_ASCII && buffer[1]) {15 if (buffer[0] == KERN_SOH_ASCII && buffer[1]) {
@@ -163,6 +160,8 @@ extern int kptr_restrict; · 144 unmodified lines
163 160
164extern void wake_up_klogd(void);161extern void wake_up_klogd(void);
165 162
163char *log_buf_addr_get(void);
164u32 log_buf_len_get(void);
166void log_buf_kexec_setup(void);165void log_buf_kexec_setup(void);
167void __init setup_log_buf(int early);166void __init setup_log_buf(int early);
168void dump_stack_set_arch_desc(const char *fmt, ...);167void dump_stack_set_arch_desc(const char *fmt, ...);
@@ -198,6 +197,16 @@ static inline void wake_up_klogd(void) · 29 unmodified lines
198{197{
199}198}
200 199
200static inline char *log_buf_addr_get(void)
201{
202 return NULL;
203}
204
205static inline u32 log_buf_len_get(void)
206{
207 return 0;
208}
209
201static inline void log_buf_kexec_setup(void)210static inline void log_buf_kexec_setup(void)
202{211{
203}212}