Revert "fix build"

This reverts commit e04bc4460d05a36faf7145223bd79dedb9617cd0.

Change-Id: I1128f985e870d3f7603a064d593f2de52973403e
mm: implement WasActive page flag (for improving cleancache)[faux123] (Feedback welcome if there is a different/better way to do this without using a page flag!)

Since about 2.6.27, the page replacement algorithm maintains
an "active" bit to help decide which pages are most eligible
to reclaim, see http://linux-mm.org/PageReplacementDesign

This "active' information is also useful to cleancache but is lost
by the time that cleancache has the opportunity to preserve the
pageful of data.  This patch adds a new page flag "WasActive" to
retain the state.  The flag may possibly be useful elsewhere.

It is up to each cleancache backend to utilize the bit as
it desires.  The matching patch for zcache is included here
for clarification/discussion purposes, though it will need to
go through GregKH and the staging tree.

The patch resolves issues reported with cleancache which occur
especially during streaming workloads on older processors,
see https://lkml.org/lkml/2011/8/17/351

Signed-off-by: Dan Magenheimer <dan.magenheimer@oracle.com>
backported to 2.6.35 by faux123

Signed-off-by: Blechd0se <alex.christ@hotmail.de>

Conflicts:
	include/linux/page-flags.h

Change-Id: Ied9ce543a558f4aa9ff3480d48bb3933287590f7
shmem: reduce pagefault lock contention

I'm running a shmem pagefault test case (see attached file) under a 64 CPU
system.  Profile shows shmem_inode_info->lock is heavily contented and
100% CPUs time are trying to get the lock.  In the pagefault (no swap)
case, shmem_getpage gets the lock twice, the last one is avoidable if we
prealloc a page so we could reduce one time of locking.  This is what
below patch does.

The result of the test case:
2.6.35-rc3: ~20s
2.6.35-rc3 + patch: ~12s
so this is 40% improvement.

One might argue if we could have better locking for shmem.  But even shmem
is lockless, the pagefault will soon have pagecache lock heavily contented
because shmem must add new page to pagecache.  So before we have better
locking for pagecache, improving shmem locking doesn't have too much
improvement.  I did a similar pagefault test against a ramfs file, the
test result is ~10.5s.

[akpm@linux-foundation.org: fix comment, clean up code layout, elimintate code duplication]
Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: "Zhang, Yanmin" <yanmin.zhang@intel.com>
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Signed-off-by: nobodyAtall <tsogkas@ceid.upatras.gr>
Signed-off-by: Blechd0se <alex.christ@hotmail.de>

Conflicts:
	mm/shmem.c

Change-Id: I831e32331b78b8733713aa508baedd50620d84b8
Fix redundant code

Change-Id: I3505c3797609dbea231ef1d8b77870088be41f23
sweep2wake: change behavior of sweep2wake_pwrtrigger

Current state of sweep2wake: Touchscreen recognizes input events
even when the screen is off (dmesg output looks promising).
However the input_event in sweep2wake_presspwr() won't be called
somehow. At least the key id is right (KEY_END).

Don't know why the power key function doesn't work.

Change-Id: Ib7f6983c71dd2aa0a698a21d0c400df44e9b993e
Signed-off-by: Blechd0se <alex.christ@hotmail.de>