Merge branch 'tizen_base' of ssh://review.tizen.org:29418/platform/upstream/procps...

Change-Id: I67f0f252563bc84b9c01d8d7b2f65064c6d6f802
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --cc proc/sysinfo.c
index 1435de1,85a9cb9..1d2b8e2
--- 1/proc/sysinfo.c
--- 2/proc/sysinfo.c
+++ b/proc/sysinfo.c
@@@ -36,8 -36,10 +36,11 @@@
  #include <netinet/in.h>  /* htons */
  #endif
  
+ #include <link.h>
+ #include <elf.h>
+ 
  long smp_num_cpus;     /* number of CPUs */
 +long page_bytes;       /* this architecture's page size */
  
  #define BAD_OPEN_MESSAGE                                      \
  "Error: /proc must be mounted\n"                              \

diff --cc ps/common.h
index fc4d3a8,3874f98..d9aa955
--- 1/ps/common.h
--- 2/ps/common.h
+++ b/ps/common.h
@@@ -294,9 -293,10 +294,9 @@@ extern int             header_type; /* 
  extern int             include_dead_children;
  extern int             lines_to_next_header;
  extern int             max_line_width;
 -extern const char     *namelist_file;
  extern int             negate_selection;
  extern int             page_size;  // "int" for math reasons?
- extern unsigned        personality;
+ extern unsigned        _personality;
  extern int             prefer_bsd_defaults;
  extern int             running_only;
  extern int             screen_cols;

diff --cc ps/parser.c
index 8d533b3,fcfceeb..9955978
--- 1/ps/parser.c
--- 2/ps/parser.c
+++ b/ps/parser.c
@@@ -1216,10 -1213,11 +1216,10 @@@ try_bsd
    ps_argv = argv;
    thisarg = 0;
    /* no need to reset flagptr */
 -  not_pure_unix=1;
    force_bsd=1;
    prefer_bsd_defaults=1;
-   if(!( (PER_OLD_m|PER_BSD_m) & personality )) /* if default m setting... */
-     personality |= PER_OLD_m; /* Prefer old Linux over true BSD. */
+   if(!( (PER_OLD_m|PER_BSD_m) & _personality )) /* if default m setting... */
+     _personality |= PER_OLD_m; /* Prefer old Linux over true BSD. */
    /* Do not set PER_FORCE_BSD! It is tested below. */
  
    err2 = parse_all_options();

diff --cc ps/select.c
Simple merge