From: Vyacheslav Cherkashin <v.cherkashin@samsung.com>
Date: Fri, 25 Jan 2013 08:13:50 +0000 (+0400)
Subject: Merge branch 'dev' into new_dpf
X-Git-Tag: Tizen_SDK_2.3~716^2~28
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2406815d520576009371ae4efdf29ce090d169d7;p=kernel%2Fswap-modules.git

Merge branch 'dev' into new_dpf
---

2406815d520576009371ae4efdf29ce090d169d7
diff --cc driver/module.c
index e667a60,172e9e8..a01c3e4
--- a/driver/module.c
+++ b/driver/module.c
@@@ -62,16 -62,8 +62,12 @@@ void __put_task_struct(struct task_stru
  void (*flush_cache_page) (struct vm_area_struct * vma, unsigned long page);
  #endif
  
 +#include "../../tools/gpmu/probes/entry_data.h"
 +
 +storage_arg_t sa_dpf;
 +
  static int __init InitializeModule(void)
  {
- 	if(lookup_name == NULL) {
- 		EPRINTF("fp_kallsyms_lookup_name parameter undefined!");
- 		return -1;
- 	}
  	if(device_name == NULL) {
  		EPRINTF("Using default device name!");
  		device_name = gl_szDefaultDeviceName;