Commit cb6f8739 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge yet more updates from Andrew Morton:
 "A few final bits:

   - large changes to vmalloc, yielding large performance benefits

   - tweak the console-flush-on-panic code

   - a few fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  panic: add an option to replay all the printk message in buffer
  initramfs: don't free a non-existent initrd
  fs/writeback.c: use rcu_barrier() to wait for inflight wb switches going into workqueue when umount
  mm/compaction.c: correct zone boundary handling when isolating pages from a pageblock
  mm/vmap: add DEBUG_AUGMENT_LOWEST_MATCH_CHECK macro
  mm/vmap: add DEBUG_AUGMENT_PROPAGATE_CHECK macro
  mm/vmalloc.c: keep track of free blocks for vmap allocation
parents ff8583d6 de6da1e8

Documentation/admin-guide/kernel-parameters.txt

+1 −0
Original line number Diff line number Diff line
@@ -3212,6 +3212,7 @@ 
			bit 2: print timer info

			bit 3: print locks info if CONFIG_LOCKDEP is on

			bit 4: print ftrace buffer

			bit 5: print all printk messages in buffer



	panic_on_warn	panic() instead of WARN().  Useful to cause kdump

			on a WARN().

arch/powerpc/kernel/traps.c

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ extern void panic_flush_kmsg_end(void) 
	kmsg_dump(KMSG_DUMP_PANIC);

	bust_spinlocks(0);

	debug_locks_off();

	console_flush_on_panic();

	console_flush_on_panic(CONSOLE_FLUSH_PENDING);

}



static unsigned long oops_begin(struct pt_regs *regs)

fs/fs-writeback.c

+8 −3
Original line number Diff line number Diff line
@@ -523,8 +523,6 @@ static void inode_switch_wbs(struct inode *inode, int new_wb_id) 


	isw->inode = inode;



	atomic_inc(&isw_nr_in_flight);



	/*

	 * In addition to synchronizing among switchers, I_WB_SWITCH tells

	 * the RCU protected stat update paths to grab the i_page
@@ -532,6 +530,9 @@ static void inode_switch_wbs(struct inode *inode, int new_wb_id) 
	 * Let's continue after I_WB_SWITCH is guaranteed to be visible.

	 */

	call_rcu(&isw->rcu_head, inode_switch_wbs_rcu_fn);



	atomic_inc(&isw_nr_in_flight);



	goto out_unlock;



out_free:
@@ -901,7 +902,11 @@ restart: 
void cgroup_writeback_umount(void)

{

	if (atomic_read(&isw_nr_in_flight)) {

		synchronize_rcu();

		/*

		 * Use rcu_barrier() to wait for all pending callbacks to

		 * ensure that all in-flight wb switches are in the workqueue.

		 */

		rcu_barrier();

		flush_workqueue(isw_wq);

	}

}

include/linux/console.h

+6 −1
Original line number Diff line number Diff line
@@ -166,6 +166,11 @@ struct console { 
extern int console_set_on_cmdline;

extern struct console *early_console;



enum con_flush_mode {

	CONSOLE_FLUSH_PENDING,

	CONSOLE_REPLAY_ALL,

};



extern int add_preferred_console(char *name, int idx, char *options);

extern void register_console(struct console *);

extern int unregister_console(struct console *);
@@ -175,7 +180,7 @@ extern int console_trylock(void); 
extern void console_unlock(void);

extern void console_conditional_schedule(void);

extern void console_unblank(void);

extern void console_flush_on_panic(void);

extern void console_flush_on_panic(enum con_flush_mode mode);

extern struct tty_driver *console_device(int *);

extern void console_stop(struct console *);

extern void console_start(struct console *);

include/linux/vmalloc.h

+5 −1
Original line number Diff line number Diff line
@@ -50,12 +50,16 @@ struct vm_struct { 
struct vmap_area {

	unsigned long va_start;

	unsigned long va_end;



	/*

	 * Largest available free size in subtree.

	 */

	unsigned long subtree_max_size;

	unsigned long flags;

	struct rb_node rb_node;         /* address sorted rbtree */

	struct list_head list;          /* address sorted list */

	struct llist_node purge_list;    /* "lazy purge" list */

	struct vm_struct *vm;

	struct rcu_head rcu_head;

};



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE