Merge branch 'kernel' of 106.109.8.71:/srv/git/dbi into kernel

Conflicts:
	src/modules/writer/swap_writer_module.h

diff --cc writer/swap_writer_module.c
Simple merge

diff --cc writer/swap_writer_module.h
index 358c162,f7df135..8e8bb29
--- 1/writer/swap_writer_module.h
--- 2/writer/swap_writer_module.h
+++ b/writer/swap_writer_module.h
@@@ -23,7 -23,10 +23,10 @@@ struct pt_regs
  int init_msg(size_t buf_size);
  void uninit_msg(void);
  
 -int proc_info_msg(struct task_struct *task);
+ void reset_discarded(void);
+ unsigned int get_discarded_count(void);
+ 
 +int proc_info_msg(struct task_struct *task, void *priv);
  int sample_msg(struct pt_regs *regs);
  
  int entry_event(const char *fmt, struct pt_regs *regs,