Revert "UBUNTU: ubuntu: compcache -- version 0.5.3"

This reverts commit 5eddaa1b0cba49fbeeb497a56573f58b9ac59696.

Conflicts:

	ubuntu/Kconfig
	ubuntu/Makefile

BugLink: http://bugs.launchpad.net/bugs/832694
Signed-off-by: Andy Whitcroft <apw@canonical.com>

15 files changed, 0 insertions, 2868 deletions

diff --git a/ubuntu/Kconfig b/ubuntu/Kconfig
index dec0d2cebe4..0d372055cc8 100644
--- a/ubuntu/Kconfig
+++ b/ubuntu/Kconfig
@@ -10,7 +10,6 @@ menu "Ubuntu Supplied Third-Party Device Drivers"
 ##
 ##
 ##
-source "ubuntu/compcache/Kconfig"
 ##
 ##
 ##
diff --git a/ubuntu/Makefile b/ubuntu/Makefile
index 388e1e41d04..7ac7805f809 100644
--- a/ubuntu/Makefile
+++ b/ubuntu/Makefile
@@ -12,7 +12,6 @@
 ##
 ##
 ##
-obj-$(CONFIG_BLK_DEV_COMPCACHE)	+= compcache/
 ##
 ##
 ##
diff --git a/ubuntu/compcache/BOM b/ubuntu/compcache/BOM
deleted file mode 100644
index 6665b655eb9..00000000000
--- a/ubuntu/compcache/BOM
+++ /dev/null
@@ -1,2 +0,0 @@
-Downloaded from:	http://code.google.com/p/compcache/
-Current Version:	0.5.3
diff --git a/ubuntu/compcache/Changelog b/ubuntu/compcache/Changelog
deleted file mode 100644
index a0ff085abd8..00000000000
--- a/ubuntu/compcache/Changelog
+++ /dev/null
@@ -1,82 +0,0 @@
-version 0.5.3	(8/4/2009)
- - Major cleanups.
- - Rename module: compcache.ko -> ramzswap.ko
- - Rename params: backing_dev -> backing_swap
- - Updated use_compcache.sh script with detailed
-   documentation on parameters.
- - LZO de/compress modules are no longer packaged
-   with compcache. Most distros now include these.
-
-version 0.5.2	(11/3/2009)
- - Can forward incompressible pages to physical swap disk.
- - New module params:
- 	- memlimit_kb
-	- disksize_kb
-	- backing_dev
-   See use_compcache.sh for documentation on these params.
- - Modified use_compcache.sh script to handle new params.
- - Detect zero-filled pages and don't allocate any memory
-   for them.
-
-version 0.5.1	(22/1/2009)
- - Fix crash on x86 systems with higmem (mem > ~1G).
-   This required minor changes to atomic (un)map functions (see Issue #20).
-
-version 0.5	(16/1/2009)
- - Fix crash in case compcache init fails.
-
-version 0.5pre4	(10/1/2009)
- - Support discarding pages for freed swap blocks (requires 2.6.28-git14).
-   This feature will be disabled if compiled for older kernel.
- - Mark ramzswap as "solid-state" block device (requires 2.6.26-git14).
- - Fixed incorrect stats reporting in /proc/compcache (some
-   new stats added too).
-
-version 0.5pre3	(5/1/2009)
- - Use kmap_atomic() in xvMalloc. This fixes issue #19
- - Remove xvMapPage() and xvUnmapMap() from xvMalloc.
-
-version 0.5pre2 (28/10/2008)
- - Alloc full page for uncompressible pages instead
-   of returning I/O error.
- - Warn users when using ramzswap > (2 x RAM size)
-
-version 0.5pre1 (15/10/2008)
- - Replaced TLSF with xvMalloc memory allocator
-   http://code.google.com/p/compcache/wiki/xvMalloc
-
-version 0.4	(13/8/2008)
- - Enable debug and stats option for compcache and tlsf by default
-   proc nodes: /proc/{tlsfinfo,compcache}
- - Fix crash when reading /proc/tlsfinfo
- - Lots of cleanups: clean compile on x64
- 
-version 0.3	(17/3/2008)
- - Fix spurious swap read failures
- - Better swap request filtering
- - Swap device again renamed to /dev/ramzswap0
-   This is to prevent Ubuntu installer from presenting
-   this device as possible installation target (see Issue #5)
- - use_compcache.sh script now waits for disk node to be created
-   instead of arbitrary sleep (see Issue #6).
- - Modified scripts: use_compcache.sh and unuse_compcache.sh
-   to now use new device name (compcache0 -> ramzswap0).
-
-version 0.2	(3/3/2008)
- - Fixed bug on systems with highmem
- - Better filtering-out of non-swap requests
- - Export statistics through proc nodes:
-   - /proc/compcache
-   - /proc/tlsfinfo
- - Debug and Statistics support for allocator
-   and compcache can now be individually turned
-   on/off by setting DEBUG, STATS to 0/1 in
-   respective header files
- - Swap device now renamed to /dev/compcache0
- - Added scripts: use_compcache.sh and unuse_compcache.sh
-   See README for usage
- - Default compcache size set to 25% of RAM
- - Lots of code cleanups
- - Updated README
- - Created Changelog :)
-
diff --git a/ubuntu/compcache/GPL.txt b/ubuntu/compcache/GPL.txt
deleted file mode 100644
index 589ce5be28c..00000000000
--- a/ubuntu/compcache/GPL.txt
+++ /dev/null
@@ -1,280 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
diff --git a/ubuntu/compcache/Kconfig b/ubuntu/compcache/Kconfig
deleted file mode 100644
index 5c79c6adebb..00000000000
--- a/ubuntu/compcache/Kconfig
+++ /dev/null
@@ -1,31 +0,0 @@
-menu "Compcache options"
-
-config BLK_DEV_COMPCACHE
-	tristate "Compressed RAM based swap device"
-	default m
-	select LZO_COMPRESS
-	select LZO_DECOMPRESS
-	depends on BLOCK
-	help
-	  This creates RAM based block device which acts as swap disk. Pages
-	  swapped to this disk are compressed and stored in memory itself.
-	  Project Home: http://code.google.com/p/compcache/
-
-config BLK_DEV_COMPCACHE_DEBUG
-	default n
-	depends on BLK_DEV_COMPCACHE
-	bool "Enable debugging"
-	help
-	  This causes negligible performance loss and size increase.
-	  If unsure, say Y.
-
-config BLK_DEV_COMPCACHE_STATS
-	default n
-	depends on BLK_DEV_COMPCACHE
-	bool "Enable statistics"
-	help
-	  Creates /proc/compcache to export various statistics.
-	  This adds about 4K to size with negligible performance loss.
-	  If unsure, say Y.
- 
-endmenu
diff --git a/ubuntu/compcache/LGPL-2.1.txt b/ubuntu/compcache/LGPL-2.1.txt
deleted file mode 100644
index 2d2d780e601..00000000000
--- a/ubuntu/compcache/LGPL-2.1.txt
+++ /dev/null
@@ -1,510 +0,0 @@
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-	51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations
-below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it
-becomes a de-facto standard.  To achieve this, non-free programs must
-be allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control
-compilation and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at least
-    three years, to give the same user the materials specified in
-    Subsection 6a, above, for a charge no more than the cost of
-    performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply, and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License
-may add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms
-of the ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.
-It is safest to attach them to the start of each source file to most
-effectively convey the exclusion of warranty; and each file should
-have at least the "copyright" line and a pointer to where the full
-notice is found.
-
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or
-your school, if any, to sign a "copyright disclaimer" for the library,
-if necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James
-  Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/ubuntu/compcache/Makefile b/ubuntu/compcache/Makefile
deleted file mode 100644
index b6b4c452efc..00000000000
--- a/ubuntu/compcache/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-$(CONFIG_BLK_DEV_COMPCACHE) := ramzswap.o xvmalloc.o
diff --git a/ubuntu/compcache/README b/ubuntu/compcache/README
deleted file mode 100644
index ebe39c19eb3..00000000000
--- a/ubuntu/compcache/README
+++ /dev/null
@@ -1,45 +0,0 @@
-ramzswap: Compressed RAM based swap device
--------------------------------------------
-
-Project home: http://compcache.googlecode.com
-
-* Introduction
-This is a RAM based block device which acts as swap disk.
-Pages swapped to this device are compressed and stored in
-memory itself. See project home for use cases, performance
-numbers and lot more.
-
-* Compiling
- - Run 'make': this will compile all modules against your kernel.
-
- - Following kernel modules are created:
-   - xvmalloc.ko
-   - ramzswap.ko
-
-* Using
- - Following scipts are included
-   - use_ramzswap.sh [<disksize(KB)|<memlimit(KB)>] [<backing_swap>]
-     This loads all required modules and sets up swap device.
-     NOTE: script contains detailed documentation on parameters.
-
-   - unuse_ramzswap.sh
-     Unloads all modules and turns off ramzswap swap device.
-
-* Common Problems
- - If you get lots of compile errors, make sure you have package for
-   kernel source installed. For e.g., on Fedora its 'kernel-devel' package.
-
- - If (un)use_ramzswap scripts fail to work, refer to wiki:
-   http://code.google.com/p/compcache/wiki/CompilingAndUsing
-
-* Notes
- - Statistics are exported via /proc/ramzswap
-
-Please consider using Issue Tracker:
-http://code.google.com/p/compcache/issues/list
-for reporting any bugs/feature requests.
-
-Cheers!
-Nitin Gupta
-EMail: ngupta at vflare dot org
-
diff --git a/ubuntu/compcache/compat.h b/ubuntu/compcache/compat.h
deleted file mode 100644
index 7f611264867..00000000000
--- a/ubuntu/compcache/compat.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef _CCACHE_COMPAT_H_
-#define _CCACHE_COMPAT_H_
-
-#include <linux/version.h>
-
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,23)
-#define BIO_IO_ERROR(bio)	bio_io_error(bio, PAGE_SIZE)
-#define BIO_ENDIO(bio, error)	bio_endio(bio, PAGE_SIZE, error)
-#else
-#define BIO_IO_ERROR(bio)	bio_io_error(bio)
-#define BIO_ENDIO(bio, error)	bio_endio(bio, error)
-#endif
-
-#ifndef pr_err
-#define pr_err(fmt, arg...) \
-	printk(KERN_ERR fmt, ##arg)
-#endif
-
-#ifndef pr_warning
-#define pr_warning(fmt, arg...) \
-	printk(KERN_WARNING fmt, ##arg)
-#endif
-
-#ifndef pr_info
-#define pr_info(fmt, arg...) \
-	printk(KERN_ERR fmt, ##arg)
-#endif
-
-#ifdef bio_discard
-#define SWAP_DISCARD_SUPPORTED
-#endif
-
-#endif
-
diff --git a/ubuntu/compcache/ramzswap.c b/ubuntu/compcache/ramzswap.c
deleted file mode 100644
index 3cd9c0e7304..00000000000
--- a/ubuntu/compcache/ramzswap.c
+++ /dev/null
@@ -1,1049 +0,0 @@
-/*
- * Compressed RAM based swap device
- *
- * Copyright (C) 2008, 2009  Nitin Gupta
- *
- * This RAM based block device acts as swap disk.
- * Pages swapped to this device are compressed and
- * stored in memory.
- *
- * Released under the terms of GNU General Public License Version 2.0
- *
- * Project home: http://compcache.googlecode.com
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/bitops.h>
-#include <linux/blkdev.h>
-#include <linux/buffer_head.h>
-#include <linux/device.h>
-#include <linux/genhd.h>
-#include <linux/highmem.h>
-#include <linux/lzo.h>
-#include <linux/mutex.h>
-#include <linux/proc_fs.h>
-#include <linux/string.h>
-#include <linux/swap.h>
-#include <linux/swapops.h>
-#include <linux/vmalloc.h>
-
-#include "compat.h"
-#include "ramzswap.h"
-
-/* Globals */
-static struct ramzswap rzs;
-static struct ramzswap_stats stats;
-/*
- * Pages that compress to larger than this size are
- * forwarded to backing swap, if present or stored
- * uncompressed in memory otherwise.
- */
-static unsigned int MAX_CPAGE_SIZE;
-
-/* Module params (documentation at end) */
-static unsigned long disksize_kb;
-static unsigned long memlimit_kb;
-static char *backing_swap;
-
-static int __init ramzswap_init(void);
-static struct block_device_operations ramzswap_devops = {
-	.owner = THIS_MODULE,
-};
-
-static int test_flag(u32 index, enum rzs_pageflags flag)
-{
-	return rzs.table[index].flags & BIT(flag);
-}
-
-static void set_flag(u32 index, enum rzs_pageflags flag)
-{
-	rzs.table[index].flags |= BIT(flag);
-}
-
-static void clear_flag(u32 index, enum rzs_pageflags flag)
-{
-	rzs.table[index].flags &= ~BIT(flag);
-}
-
-static int page_zero_filled(void *ptr)
-{
-	u32 pos;
-	u64 *page;
-
-	page = (u64 *)ptr;
-
-	for (pos = 0; pos != PAGE_SIZE / sizeof(*page); pos++) {
-		if (page[pos])
-			return 0;
-	}
-
-	return 1;
-}
-
-/*
- * Given <pagenum, offset> pair, provide a dereferencable pointer.
- */
-static void *get_ptr_atomic(u32 pagenum, u16 offset, enum km_type type)
-{
-	unsigned char *page;
-
-	page = kmap_atomic(pfn_to_page(pagenum), type);
-	return page + offset;
-}
-
-static void put_ptr_atomic(void *ptr, enum km_type type)
-{
-	kunmap_atomic(ptr, type);
-}
-
-#if defined(STATS)
-static struct proc_dir_entry *proc;
-
-static int proc_ramzswap_read(char *page, char **start, off_t off,
-				int count, int *eof, void *data)
-{
-	int len;
-	size_t succ_writes, mem_used;
-	unsigned int good_compress_perc = 0, no_compress_perc = 0;
-
-	mem_used = xv_get_total_size_bytes(rzs.mem_pool)
-			+ (stats.pages_expand << PAGE_SHIFT);
-
-	if (off > 0) {
-		*eof = 1;
-		return 0;
-	}
-
-#define K(x)	((x) >> 10)
-	/* Basic stats */
-	len = sprintf(page,
-		"DiskSize:	%8zu kB\n",
-		(size_t)(K(rzs.disksize)));
-
-	if (rzs.backing_swap) {
-		/* This must always be less than ComprDataSize */
-		len += sprintf(page + len,
-			"MemLimit:	%8zu kB\n",
-			K(rzs.memlimit));
-	}
-
-	succ_writes = stats.num_writes - stats.failed_writes;
-
-	if (succ_writes && stats.pages_stored) {
-		good_compress_perc = stats.good_compress * 100
-					/ stats.pages_stored;
-		no_compress_perc = stats.pages_expand * 100
-					/ stats.pages_stored;
-	}
-
-	/* Extended stats */
-	len += sprintf(page + len,
-		"NumReads:	%8llu\n"
-		"NumWrites:	%8llu\n"
-		"FailedReads:	%8llu\n"
-		"FailedWrites:	%8llu\n"
-		"InvalidIO:	%8llu\n"
-		"PagesDiscard:	%8llu\n"
-		"ZeroPages:	%8u\n"
-		"GoodCompress:	%8u %%\n"
-		"NoCompress:	%8u %%\n"
-		"PagesStored:	%8u\n"
-		"PagesUsed:	%8zu\n"
-		"OrigDataSize:	%8zu kB\n"
-		"ComprDataSize:	%8zu kB\n"
-		"MemUsedTotal:	%8zu kB\n",
-		stats.num_reads,
-		stats.num_writes,
-		stats.failed_reads,
-		stats.failed_writes,
-		stats.invalid_io,
-		stats.pages_discard,
-		stats.pages_zero,
-		good_compress_perc,
-		no_compress_perc,
-		stats.pages_stored,
-		mem_used >> PAGE_SHIFT,
-		(size_t)(K(stats.pages_stored << PAGE_SHIFT)),
-		(size_t)(K(stats.compr_size)),
-		(size_t)(K(mem_used)));
-
-	if (rzs.backing_swap) {
-		/* This must always be less than ComprDataSize */
-		len += sprintf(page + len,
-			"BDevNumReads:	%8llu\n"
-			"BDevNumWrites:	%8llu\n",
-			stats.bdev_num_reads,
-			stats.bdev_num_writes);
-	}
-
-	return len;
-}
-#endif	/* STATS */
-
-/*
- * Check if value of backing_swap module param is sane.
- * Claim this device and set ramzswap size equal to
- * size of this block device.
- */
-static int setup_backing_swap(void)
-{
-	int error = 0;
-	struct inode *inode;
-	struct file *swap_file;
-	struct address_space *mapping;
-	struct block_device *bdev = NULL;
-
-	if (backing_swap == NULL) {
-		pr_debug(C "backing_swap param not given\n");
-		goto out;
-	}
-
-	pr_info(C "Using backing swap device: %s\n", backing_swap);
-
-	swap_file = filp_open(backing_swap, O_RDWR | O_LARGEFILE, 0);
-	if (IS_ERR(swap_file)) {
-		pr_err(C "Error opening backing device: %s\n", backing_swap);
-		error = -EINVAL;
-		goto out;
-	}
-
-	mapping = swap_file->f_mapping;
-	inode = mapping->host;
-
-	if (S_ISBLK(inode->i_mode)) {
-		bdev = I_BDEV(inode);
-		error = bd_claim(bdev, ramzswap_init);
-		if (error < 0) {
-			bdev = NULL;
-			goto bad_param;
-		}
-		rzs.old_block_size = block_size(bdev);
-		error = set_blocksize(bdev, PAGE_SIZE);
-		if (error < 0)
-			goto bad_param;
-	} else {
-		/* TODO: support for regular file as backing swap */
-		pr_info(C "%s is not a block device.\n", backing_swap);
-		error = -EINVAL;
-		goto out;
-	}
-
-	rzs.swap_file = swap_file;
-	rzs.backing_swap = bdev;
-	rzs.disksize = i_size_read(inode);
-	BUG_ON(!rzs.disksize);
-
-	return 0;
-
-bad_param:
-	if (bdev) {
-		set_blocksize(bdev, rzs.old_block_size);
-		bd_release(bdev);
-	}
-	filp_close(swap_file, NULL);
-
-out:
-	rzs.backing_swap = NULL;
-	return error;
-}
-
-/*
- * Check if request is within bounds and page aligned.
- */
-static inline int valid_swap_request(struct bio *bio)
-{
-	if (unlikely(
-		(bio->bi_sector >= (rzs.disksize >> SECTOR_SHIFT)) ||
-		(bio->bi_sector & (SECTORS_PER_PAGE - 1)) ||
-		(bio->bi_vcnt != 1) ||
-		(bio->bi_size != PAGE_SIZE) ||
-		(bio->bi_io_vec[0].bv_offset != 0))) {
-
-		return 0;
-	}
-
-	/* swap request is valid */
-	return 1;
-}
-
-static void ramzswap_free_page(size_t index)
-{
-	u32 clen;
-	void *obj;
-
-	u32 pagenum = rzs.table[index].pagenum;
-	u32 offset = rzs.table[index].offset;
-
-	if (unlikely(test_flag(index, RZS_UNCOMPRESSED))) {
-		clen = PAGE_SIZE;
-		__free_page(pfn_to_page(pagenum));
-		clear_flag(index, RZS_UNCOMPRESSED);
-		stat_dec(stats.pages_expand);
-		goto out;
-	}
-
-	obj = get_ptr_atomic(pagenum, offset, KM_USER0);
-	clen = xv_get_object_size(obj) - sizeof(struct zobj_header);
-	put_ptr_atomic(obj, KM_USER0);
-
-	xv_free(rzs.mem_pool, pagenum, offset);
-	stat_dec_if_less(stats.good_compress, clen, PAGE_SIZE / 2 + 1);
-
-out:
-	stats.compr_size -= clen;
-	stat_dec(stats.pages_stored);
-
-	rzs.table[index].pagenum = 0;
-	rzs.table[index].offset = 0;
-}
-
-#ifdef SWAP_DISCARD_SUPPORTED
-static int ramzswap_prepare_discard(struct request_queue *q,
-					struct request *req)
-{
-	return 0;
-}
-
-/*
- * Called by main I/O handler function. This helper
- * function handles 'discard' I/O requests which means
- * that  some swap pages are no longer required, so
- * swap device can take needed action -- we free memory
- * allocated for these pages.
- */
-static int ramzswap_discard(struct bio *bio)
-{
-	size_t index, start_page, num_pages;
-
-	start_page = bio->bi_sector >> SECTORS_PER_PAGE_SHIFT;
-	num_pages = bio->bi_size >> (SECTOR_SHIFT + SECTORS_PER_PAGE_SHIFT);
-
-	for (index = start_page; index < start_page + num_pages; index++) {
-		if (rzs.table[index].pagenum) {
-			ramzswap_free_page(index);
-			stat_inc(stats.pages_discard);
-		}
-	}
-
-	set_bit(BIO_UPTODATE, &bio->bi_flags);
-	BIO_ENDIO(bio, 0);
-	return 0;
-}
-#endif
-
-int handle_zero_page(struct bio *bio)
-{
-	void *user_mem;
-	struct page *page = bio->bi_io_vec[0].bv_page;
-
-	user_mem = get_ptr_atomic(page_to_pfn(page), 0, KM_USER0);
-	memset(user_mem, 0, PAGE_SIZE);
-	put_ptr_atomic(user_mem, KM_USER0);
-
-	set_bit(BIO_UPTODATE, &bio->bi_flags);
-	BIO_ENDIO(bio, 0);
-	return 0;
-}
-
-int handle_uncompressed_page(struct bio *bio)
-{
-	u32 index;
-	struct page *page;
-	unsigned char *user_mem, *cmem;
-
-	page = bio->bi_io_vec[0].bv_page;
-	index = bio->bi_sector >>SECTORS_PER_PAGE_SHIFT;
-
-	user_mem = get_ptr_atomic(page_to_pfn(page), 0, KM_USER0);
-	cmem = get_ptr_atomic(rzs.table[index].pagenum,
-			rzs.table[index].offset, KM_USER1);
-
-	memcpy(user_mem, cmem, PAGE_SIZE);
-	put_ptr_atomic(user_mem, KM_USER0);
-	put_ptr_atomic(cmem, KM_USER1);
-
-	set_bit(BIO_UPTODATE, &bio->bi_flags);
-	BIO_ENDIO(bio, 0);
-	return 0;
-}
-
-
-/*
- * Called when request page is not present in ramzswap.
- * Its either in backing swap device (if present) or
- * this is an attempt to read before any previous write
- * to this location - this happens due to readahead when
- * swap device is read from user-space (e.g. during swapon)
- */
-int handle_ramzswap_fault(struct bio *bio)
-{
-	void *user_mem;
-	struct page *page = bio->bi_io_vec[0].bv_page;
-
-	/*
-	 * Always forward such requests to backing swap
-	 * device (if present)
-	 */
-	if (rzs.backing_swap) {
-		stat_dec(stats.num_reads);
-		stat_inc(stats.bdev_num_reads);
-		bio->bi_bdev = rzs.backing_swap;
-		return 1;
-	}
-
-	/*
-	 * Its unlikely event in case backing dev is
-	 * not present
-	 */
-	pr_debug(C "Read before write on swap device: "
-		"sector=%lu, size=%u, offset=%u\n",
-		(ulong)(bio->bi_sector), bio->bi_size,
-		bio->bi_io_vec[0].bv_offset);
-	user_mem = kmap(page);
-	memset(user_mem, 0, PAGE_SIZE);
-	kunmap(page);
-
-	set_bit(BIO_UPTODATE, &bio->bi_flags);
-	BIO_ENDIO(bio, 0);
-	return 0;
-}
-
-int ramzswap_read(struct bio *bio)
-{
-	int ret;
-	u32 index;
-	size_t clen;
-	struct page *page;
-	struct zobj_header *zheader;
-	unsigned char *user_mem, *cmem;
-
-	stat_inc(stats.num_reads);
-
-	page = bio->bi_io_vec[0].bv_page;
-	index = bio->bi_sector >> SECTORS_PER_PAGE_SHIFT;
-
-	if (test_flag(index, RZS_ZERO))
-		return handle_zero_page(bio);
-
-	/* Requested page is not present in compressed area */
-	if (!rzs.table[index].pagenum)
-		return handle_ramzswap_fault(bio);
-
-	/* Page is stored uncompressed since its incompressible */
-	if (unlikely(test_flag(index, RZS_UNCOMPRESSED)))
-		return handle_uncompressed_page(bio);
-
-	user_mem = get_ptr_atomic(page_to_pfn(page), 0, KM_USER0);
-	clen = PAGE_SIZE;
-
-	cmem = get_ptr_atomic(rzs.table[index].pagenum,
-			rzs.table[index].offset, KM_USER1);
-
-	ret = lzo1x_decompress_safe(
-		cmem + sizeof(*zheader),
-		xv_get_object_size(cmem) - sizeof(*zheader),
-		user_mem, &clen);
-
-	put_ptr_atomic(user_mem, KM_USER0);
-	put_ptr_atomic(cmem, KM_USER1);
-
-	/* should NEVER happen */
-	if (unlikely(ret != LZO_E_OK)) {
-		pr_err(C "Decompression failed! err=%d, page=%u\n",
-			ret, index);
-		stat_inc(stats.failed_reads);
-		goto out;
-	}
-
-	set_bit(BIO_UPTODATE, &bio->bi_flags);
-	BIO_ENDIO(bio, 0);
-	return 0;
-
-out:
-	BIO_IO_ERROR(bio);
-	return 0;
-}
-
-int ramzswap_write(struct bio *bio)
-{
-	int ret, fwd_write_request = 0;
-	u32 offset;
-	size_t clen, index;
-	struct zobj_header *zheader;
-	struct page *page, *page_store;
-	unsigned char *user_mem, *cmem, *src;
-
-	stat_inc(stats.num_writes);
-
-	page = bio->bi_io_vec[0].bv_page;
-	index = bio->bi_sector >> SECTORS_PER_PAGE_SHIFT;
-
-	src = rzs.compress_buffer;
-
-	/*
-	 * System swaps to same sector again when the stored page
-	 * is no longer referenced by any process. So, its now safe
-	 * to free the memory that was allocated for this page.
-	 */
-	if (rzs.table[index].pagenum)
-		ramzswap_free_page(index);
-
-	/*
-	 * No memory ia allocated for zero filled pages.
-	 * Simply clear zero page flag.
-	 */
-	if (test_flag(index, RZS_ZERO)) {
-		stat_dec(stats.pages_zero);
-		clear_flag(index, RZS_ZERO);
-	}
-
-	mutex_lock(&rzs.lock);
-
-	user_mem = get_ptr_atomic(page_to_pfn(page), 0, KM_USER0);
-	if (page_zero_filled(user_mem)) {
-		put_ptr_atomic(user_mem, KM_USER0);
-		mutex_unlock(&rzs.lock);
-		stat_inc(stats.pages_zero);
-		set_flag(index, RZS_ZERO);
-
-		set_bit(BIO_UPTODATE, &bio->bi_flags);
-		BIO_ENDIO(bio, 0);
-		return 0;
-	}
-
-	if (rzs.backing_swap &&
-		(stats.compr_size > rzs.memlimit - PAGE_SIZE)) {
-		put_ptr_atomic(user_mem, KM_USER0);
-		mutex_unlock(&rzs.lock);
-		fwd_write_request = 1;
-		goto out;
-	}
-
-	ret = lzo1x_1_compress(user_mem, PAGE_SIZE, src, &clen,
-				rzs.compress_workmem);
-
-	put_ptr_atomic(user_mem, KM_USER0);
-
-	if (unlikely(ret != LZO_E_OK)) {
-		mutex_unlock(&rzs.lock);
-		pr_err(C "Compression failed! err=%d\n", ret);
-		stat_inc(stats.failed_writes);
-		goto out;
-	}
-
-	/*
-	 * Page is incompressible. Forward it to backing swap
-	 * if present. Otherwise, store it as-is (uncompressed)
-	 * since we do not want to return too many swap write
-	 * errors which has side effect of hanging the system.
-	 */
-	if (unlikely(clen > MAX_CPAGE_SIZE)) {
-		if (rzs.backing_swap) {
-			mutex_unlock(&rzs.lock);
-			fwd_write_request = 1;
-			goto out;
-		}
-
-		clen = PAGE_SIZE;
-		page_store = alloc_page(GFP_NOIO | __GFP_HIGHMEM);
-		if (unlikely(!page_store)) {
-			mutex_unlock(&rzs.lock);
-			stat_inc(stats.failed_writes);
-			goto out;
-		}
-
-		offset = 0;
-		set_flag(index, RZS_UNCOMPRESSED);
-		stat_inc(stats.pages_expand);
-		rzs.table[index].pagenum = page_to_pfn(page_store);
-		src = get_ptr_atomic(page_to_pfn(page), 0, KM_USER0);
-		goto memstore;
-	}
-
-	if (xv_malloc(rzs.mem_pool, clen + sizeof(*zheader),
-			&rzs.table[index].pagenum, &offset,
-			GFP_NOIO | __GFP_HIGHMEM)) {
-		mutex_unlock(&rzs.lock);
-		pr_info(C "Error allocating memory for compressed "
-			"page: %zu, size=%zu\n", index, clen);
-		stat_inc(stats.failed_writes);
-		if (rzs.backing_swap)
-			fwd_write_request = 1;
-		goto out;
-	}
-
-memstore:
-	rzs.table[index].offset = offset;
-
-	cmem = get_ptr_atomic(rzs.table[index].pagenum,
-			rzs.table[index].offset, KM_USER1);
-
-#if 0
-	/* Back-reference needed for memory defragmentation */
-	if (!test_flag(index, RZS_UNCOMPRESSED)) {
-		zheader = (struct zobj_header *)cmem;
-		zheader->table_idx = index;
-		cmem += sizeof(*zheader);
-	}
-#endif
-
-	memcpy(cmem, src, clen);
-
-	put_ptr_atomic(cmem, KM_USER1);
-	if (unlikely(test_flag(index, RZS_UNCOMPRESSED)))
-		put_ptr_atomic(src, KM_USER0);
-
-	/* Update stats */
-	stats.compr_size += clen;
-	stat_inc(stats.pages_stored);
-	stat_inc_if_less(stats.good_compress, clen, PAGE_SIZE / 2 + 1);
-
-	mutex_unlock(&rzs.lock);
-
-	set_bit(BIO_UPTODATE, &bio->bi_flags);
-	BIO_ENDIO(bio, 0);
-	return 0;
-
-out:
-	if (fwd_write_request) {
-		stat_inc(stats.bdev_num_writes);
-		bio->bi_bdev = rzs.backing_swap;
-		return 1;
-	}
-
-	BIO_IO_ERROR(bio);
-	return 0;
-}
-
-/*
- * Handler function for all ramzswap I/O requests.
- */
-static int ramzswap_make_request(struct request_queue *queue, struct bio *bio)
-{
-	int ret = 0;
-
-#ifdef SWAP_DISCARD_SUPPORTED
-	if (bio_discard(bio))
-		return ramzswap_discard(bio);
-#endif
-
-	if (!valid_swap_request(bio)) {
-		stat_inc(stats.invalid_io);
-		BIO_IO_ERROR(bio);
-		return 0;
-	}
-
-	switch (bio_data_dir(bio)) {
-	case READ:
-		ret = ramzswap_read(bio);
-		break;
-
-	case WRITE:
-		ret = ramzswap_write(bio);
-		break;
-	}
-
-	return ret;
-}
-
-/*
- * Swap header (1st page of swap device) contains information
- * to indentify it as a swap partition. Prepare such a header
- * for ramzswap device (ramzswap0) so that swapon can identify
- * it as swap partition. In case backing swap device is provided,
- * copy its swap header.
- */
-static int setup_swap_header(union swap_header *s)
-{
-	int ret = 0;
-	struct page *page;
-	struct address_space *mapping;
-	union swap_header *backing_swap_header;
-
-	/*
-	 * There is no backing swap device. Create a swap header
-	 * that is acceptable by swapon.
-	 */
-	if (rzs.backing_swap == NULL) {
-		s->info.version = 1;
-		s->info.last_page = rzs.disksize >> PAGE_SHIFT;
-		s->info.nr_badpages = 0;
-		memcpy(s->magic.magic, "SWAPSPACE2", 10);
-		return 0;
-	}
-
-	/*
-	 * We have a backing swap device. Copy its swap header
-	 * to ramzswap device header. If this header contains
-	 * invalid information (backing device not a swap
-	 * partition, etc.), swapon will fail for ramzswap
-	 * which is correct behavior - we don't want to swap
-	 * over filesystem partition!
-	 */
-
-	/* Read the backing swap header (code from sys_swapon) */
-	mapping = rzs.swap_file->f_mapping;
-	if (!mapping->a_ops->readpage) {
-		ret = -EINVAL;
-		goto out;
-	}
-
-	page = read_mapping_page(mapping, 0, rzs.swap_file);
-	if (IS_ERR(page)) {
-		ret = PTR_ERR(page);
-		goto out;
-	}
-
-	backing_swap_header = kmap(page);
-	*s = *backing_swap_header;
-	kunmap(page);
-
-out:
-	return ret;
-}
-
-static void ramzswap_set_disksize(size_t totalram_bytes)
-{
-	rzs.disksize = disksize_kb << 10;
-
-	if (!disksize_kb) {
-		pr_info(C
-		"disk size not provided. You can use disksize_kb module "
-		"param to specify size.\nUsing default: (%u%% of RAM).\n",
-		DEFAULT_DISKSIZE_PERC_RAM
-		);
-		rzs.disksize = DEFAULT_DISKSIZE_PERC_RAM *
-					(totalram_bytes / 100);
-	}
-
-	if (disksize_kb > 2 * (totalram_bytes >> 10)) {
-		pr_info(C
-		"There is little point creating a ramzswap of greater than "
-		"twice the size of memory since we expect a 2:1 compression "
-		"ratio. Note that ramzswap uses about 0.1%% of the size of "
-		"the swap device when not in use so a huge ramzswap is "
-		"wasteful.\n"
-		"\tMemory Size: %zu kB\n"
-		"\tSize you selected: %lu kB\n"
-		"Continuing anyway ...\n",
-		totalram_bytes >> 10, disksize_kb
-		);
-	}
-
-	rzs.disksize &= PAGE_MASK;
-	pr_info(C "disk size set to %zu kB\n", rzs.disksize >> 10);
-}
-
-/*
- * memlimit cannot be greater than backing disk size.
- */
-static void ramzswap_set_memlimit(size_t totalram_bytes)
-{
-	int memlimit_valid = 1;
-	rzs.memlimit = memlimit_kb << 10;
-
-	if (!rzs.memlimit) {
-		pr_info(C "memory limit not set. You can use "
-			"memlimit_kb module param to specify limit.");
-		memlimit_valid = 0;
-	}
-
-	if (rzs.memlimit > rzs.disksize) {
-		pr_info(C "memory limit cannot be greater than "
-			"disksize: limit=%zu, disksize=%zu",
-			rzs.memlimit, rzs.disksize);
-		memlimit_valid = 0;
-	}
-
-	if (!memlimit_valid) {
-		size_t mempart, disksize;
-		pr_info(C "\nUsing default: MIN[(%u%% of RAM), "
-			"(backing disk size)].\n",
-			DEFAULT_MEMLIMIT_PERC_RAM);
-		mempart = DEFAULT_MEMLIMIT_PERC_RAM * (totalram_bytes / 100);
-		disksize = rzs.disksize;
-		rzs.memlimit = mempart > disksize ? disksize : mempart;
-	}
-
-	if (rzs.memlimit > totalram_bytes / 2) {
-		pr_info(C
-		"Its not advisable setting limit more than half of "
-		"size of memory since we expect a 2:1 compression ratio. "
-		"Limit represents amount of *compressed* data we can keep "
-		"in memory!\n"
-		"\tMemory Size: %zu kB\n"
-		"\tLimit you selected: %lu kB\n"
-		"Continuing anyway ...\n",
-		totalram_bytes >> 10, memlimit_kb
-		);
-	}
-
-	rzs.memlimit &= PAGE_MASK;
-	BUG_ON(!rzs.memlimit);
-
-	pr_info(C "memory limit set to %zu kB\n", rzs.memlimit >> 10);
-}
-
-static int __init ramzswap_init(void)
-{
-	int ret;
-	size_t num_pages, totalram_bytes;
-	struct sysinfo i;
-	struct page *page;
-	void *swap_header;
-
-	mutex_init(&rzs.lock);
-
-	ret = setup_backing_swap();
-	if (ret)
-		goto fail;
-
-	si_meminfo(&i);
-	/* Here is a trivia: guess unit used for i.totalram !! */
-	totalram_bytes = i.totalram << PAGE_SHIFT;
-
-	if (rzs.backing_swap)
-		ramzswap_set_memlimit(totalram_bytes);
-	else
-		ramzswap_set_disksize(totalram_bytes);
-
-	rzs.compress_workmem = kmalloc(LZO1X_MEM_COMPRESS, GFP_KERNEL);
-	if (rzs.compress_workmem == NULL) {
-		pr_err(C "Error allocating compressor working memory\n");
-		ret = -ENOMEM;
-		goto fail;
-	}
-
-	rzs.compress_buffer = kmalloc(2 * PAGE_SIZE, GFP_KERNEL);
-	if (rzs.compress_buffer == NULL) {
-		pr_err(C "Error allocating compressor buffer space\n");
-		ret = -ENOMEM;
-		goto fail;
-	}
-
-	num_pages = rzs.disksize >> PAGE_SHIFT;
-	rzs.table = vmalloc(num_pages * sizeof(*rzs.table));
-	if (rzs.table == NULL) {
-		pr_err(C "Error allocating ramzswap address table\n");
-		ret = -ENOMEM;
-		goto fail;
-	}
-	memset(rzs.table, 0, num_pages * sizeof(*rzs.table));
-
-	page = alloc_page(__GFP_ZERO);
-	if (page == NULL) {
-		pr_err(C "Error allocating swap header page\n");
-		ret = -ENOMEM;
-		goto fail;
-	}
-	rzs.table[0].pagenum = page_to_pfn(page);
-	set_flag(0, RZS_UNCOMPRESSED);
-
-	swap_header = kmap(page);
-	ret = setup_swap_header((union swap_header *)(swap_header));
-	kunmap(page);
-	if (ret) {
-		pr_err(C "Error setting swap header\n");
-		goto fail;
-	}
-
-	rzs.disk = alloc_disk(1);
-	if (rzs.disk == NULL) {
-		pr_err(C "Error allocating disk structure\n");
-		ret = -ENOMEM;
-		goto fail;
-	}
-
-	rzs.disk->first_minor = 0;
-	rzs.disk->fops = &ramzswap_devops;
-	/*
-	 * It is named like this to prevent distro installers
-	 * from offering ramzswap as installation target. They
-	 * seem to ignore all devices beginning with 'ram'
-	 */
-	strcpy(rzs.disk->disk_name, "ramzswap0");
-
-	rzs.disk->major = register_blkdev(0, rzs.disk->disk_name);
-	if (rzs.disk->major < 0) {
-		pr_err(C "Cannot register block device\n");
-		ret = -EFAULT;
-		goto fail;
-	}
-
-	rzs.disk->queue = blk_alloc_queue(GFP_KERNEL);
-	if (rzs.disk->queue == NULL) {
-		pr_err(C "Cannot register disk queue\n");
-		ret = -EFAULT;
-		goto fail;
-	}
-
-	set_capacity(rzs.disk, rzs.disksize >> SECTOR_SHIFT);
-	blk_queue_make_request(rzs.disk->queue, ramzswap_make_request);
-
-#ifdef QUEUE_FLAG_NONROT
-	/*
-	 * Assuming backing device is "rotational" type.
-	 * TODO: check if its actually "non-rotational" (SSD).
-	 *
-	 * We have ident mapping of sectors for ramzswap and
-	 * and the backing swap device. So, this queue flag
-	 * should be according to backing dev.
-	 */
-	if (!rzs.backing_swap)
-		queue_flag_set_unlocked(QUEUE_FLAG_NONROT, rzs.disk->queue);
-#endif
-#ifdef SWAP_DISCARD_SUPPORTED
-	blk_queue_set_discard(rzs.disk->queue, ramzswap_prepare_discard);
-#endif
-	blk_queue_logical_block_size(rzs.disk->queue, PAGE_SIZE);
-	add_disk(rzs.disk);
-
-	rzs.mem_pool = xv_create_pool();
-	if (!rzs.mem_pool) {
-		pr_err(C "Error creating memory pool\n");
-		ret = -ENOMEM;
-		goto fail;
-	}
-
-#if defined(STATS)
-	proc = create_proc_entry("ramzswap", S_IRUGO, NULL);
-	if (proc)
-		proc->read_proc = &proc_ramzswap_read;
-	else {
-		ret = -ENOMEM;
-		pr_warning(C "Error creating proc entry\n");
-		goto fail;
-	}
-#endif
-
-	/*
-	 * Pages that compress to size greater than this are forwarded
-	 * to physical swap disk (if backing dev is provided)
-	 */
-	if (rzs.backing_swap)
-		MAX_CPAGE_SIZE = MAX_CPAGE_SIZE_BDEV;
-	else
-		MAX_CPAGE_SIZE = MAX_CPAGE_SIZE_NOBDEV;
-
-	pr_debug(C "Max compressed page size: %u bytes\n", MAX_CPAGE_SIZE);
-
-	pr_debug(C "Initialization done!\n");
-	return 0;
-
-fail:
-	if (rzs.disk != NULL) {
-		if (rzs.disk->major > 0)
-			unregister_blkdev(rzs.disk->major, rzs.disk->disk_name);
-		del_gendisk(rzs.disk);
-	}
-
-	if (rzs.table && rzs.table[0].pagenum)
-		__free_page(pfn_to_page(rzs.table[0].pagenum));
-	kfree(rzs.compress_workmem);
-	kfree(rzs.compress_buffer);
-	vfree(rzs.table);
-	xv_destroy_pool(rzs.mem_pool);
-#if defined(STATS)
-	if (proc)
-		remove_proc_entry("ramzswap", proc->parent);
-#endif
-	pr_err(C "Initialization failed: err=%d\n", ret);
-	return ret;
-}
-
-static void __exit ramzswap_exit(void)
-{
-	size_t index, num_pages;
-	num_pages = rzs.disksize >> PAGE_SHIFT;
-
-	unregister_blkdev(rzs.disk->major, rzs.disk->disk_name);
-	del_gendisk(rzs.disk);
-
-	/* Close backing swap device (if present) */
-	if (rzs.backing_swap) {
-		set_blocksize(rzs.backing_swap, rzs.old_block_size);
-		bd_release(rzs.backing_swap);
-		filp_close(rzs.swap_file, NULL);
-	}
-
-	__free_page(pfn_to_page(rzs.table[0].pagenum));
-	kfree(rzs.compress_workmem);
-	kfree(rzs.compress_buffer);
-
-	/* Free all pages that are still in ramzswap */
-	for (index = 1; index < num_pages; index++) {
-		u32 pagenum, offset;
-
-		pagenum = rzs.table[index].pagenum;
-		offset = rzs.table[index].offset;
-
-		if (!pagenum)
-			continue;
-
-		if (unlikely(test_flag(index, RZS_UNCOMPRESSED)))
-			__free_page(pfn_to_page(pagenum));
-		else
-			xv_free(rzs.mem_pool, pagenum, offset);
-	}
-
-	vfree(rzs.table);
-	xv_destroy_pool(rzs.mem_pool);
-
-#if defined(STATS)
-	remove_proc_entry("ramzswap", proc->parent);
-#endif
-	pr_debug(C "cleanup done!\n");
-}
-
-/*
- * This param is applicable only when there is no backing swap device.
- * We ignore this param in case backing dev is provided since then its
- * always equal to size of the backing swap device.
- *
- * This size refers to amount of (uncompressed) data it can hold.
- * For e.g. disksize_kb=1024 means it can hold 1024kb worth of
- * uncompressed data even if this data compresses to just, say, 100kb.
- *
- * Default value is used if this param is missing or 0 (if its applicable).
- * Default: [DEFAULT_DISKSIZE_PERC_RAM]% of RAM
- */
-module_param(disksize_kb, ulong, 0);
-MODULE_PARM_DESC(disksize_kb, "ramzswap device size (kB)");
-
-/*
- * This param is applicable only when backing swap device is provided.
- * This refers to limit on amount of (compressed) data it can hold in
- * memory. Note that total amount of memory used (MemUsedTotal) can
- * exceed this memlimit since that includes memory wastage due to
- * fragmentation and metadata overhead.
- *
- * Any additional data beyond this limit is forwarded to backing
- * swap device. TODO: allow changing memlimit at runtime.
- *
- * Default value is used if this param is missing or 0 (if its applicable).
- * Default: MIN([DEFAULT_MEMLIMIT_PERC_RAM]% of RAM, Backing Device Size)
- */
-module_param(memlimit_kb, ulong, 0);
-MODULE_PARM_DESC(memlimit_kb, "ramzswap memory limit (kB)");
-
-/*
- * This is block device to be used as backing store for ramzswap.
- * When pages more than memlimit_kb as swapped to ramzswap, we store
- * any additional pages in this device. We may also move some pages
- * from ramzswap to this device in case system is really low on
- * memory (TODO).
- *
- * This device is not directly visible to kernel as a swap device
- * (/proc/swaps will only show /dev/ramzswap0 and not this device).
- * Managing this backing device is the job of ramzswap module.
- */
-module_param(backing_swap, charp, 0);
-MODULE_PARM_DESC(backing_swap, "Backing swap partition");
-
-module_init(ramzswap_init);
-module_exit(ramzswap_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Nitin Gupta <ngupta@vflare.org>");
-MODULE_DESCRIPTION("Compressed RAM Based Swap Device");
diff --git a/ubuntu/compcache/ramzswap.h b/ubuntu/compcache/ramzswap.h
deleted file mode 100644
index 0d4d867beac..00000000000
--- a/ubuntu/compcache/ramzswap.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Compressed RAM based swap device
- *
- * Copyright (C) 2008, 2009  Nitin Gupta
- *
- * This RAM based block device acts as swap disk.
- * Pages swapped to this device are compressed and
- * stored in memory.
- *
- * Released under the terms of GNU General Public License Version 2.0
- *
- * Project home: http://compcache.googlecode.com
- */
-
-#ifndef _RAMZSWAP_H_
-#define _RAMZSWAP_H_
-
-#include "xvmalloc.h"
-
-/*
- * Stored at beginning of each compressed object.
- *
- * It stores back-reference to table entry which points to this
- * object. This is required to support memory defragmentation or
- * migrating compressed pages to backing swap disk.
- */
-struct zobj_header {
-#if 0
-	u32 table_idx;
-#endif
-};
-
-/*-- Configurable parameters */
-
-/* Default ramzswap disk size: 25% of total RAM */
-#define DEFAULT_DISKSIZE_PERC_RAM	25
-#define DEFAULT_MEMLIMIT_PERC_RAM	15
-
-/*
- * Max compressed page size when backing device is provided.
- * Pages that compress to size greater than this are sent to
- * physical swap disk.
- */
-#define MAX_CPAGE_SIZE_BDEV	(PAGE_SIZE / 2)
-
-/*
- * Max compressed page size when there is no backing dev.
- * Pages that compress to size greater than this are stored
- * uncompressed in memory.
- */
-#define MAX_CPAGE_SIZE_NOBDEV	(PAGE_SIZE / 4 * 3)
-
-/*
- * NOTE: MAX_CPAGE_SIZE_{BDEV,NOBDEV} sizes must be
- * less than or equal to:
- *   XV_MAX_ALLOC_SIZE - sizeof(struct zobj_header)
- * since otherwise xvMalloc would always return failure.
- */
-
-/*-- End of configurable params */
-
-#define SECTOR_SHIFT		9
-#define SECTOR_SIZE		(1 << SECTOR_SHIFT)
-#define SECTORS_PER_PAGE_SHIFT	(PAGE_SHIFT - SECTOR_SHIFT)
-#define SECTORS_PER_PAGE	(1 << SECTORS_PER_PAGE_SHIFT)
-
-/* Message prefix */
-#define C "ramzswap: "
-
-/* Debugging and Stats */
-#define NOP	do { } while (0)
-
-#if defined(CONFIG_BLK_DEV_RAMZSWAP_STATS)
-#define STATS
-#endif
-
-#if defined(STATS)
-#define stat_inc(stat)			((stat)++)
-#define stat_dec(stat)			((stat)--)
-#define stat_inc_if_less(stat, val1, val2) \
-				((stat) += ((val1) < (val2) ? 1 : 0))
-#define stat_dec_if_less(stat, val1, val2) \
-				((stat) -= ((val1) < (val2) ? 1 : 0))
-#else	/* STATS */
-#define stat_inc(x)			NOP
-#define stat_dec(x)			NOP
-#define stat_inc_if_less(x, v1, v2)	NOP
-#define stat_dec_if_less(x, v1, v2)	NOP
-#endif	/* STATS */
-
-/* Flags for ramzswap pages (table[page_no].flags) */
-enum rzs_pageflags {
-	/* Page is stored uncompressed */
-	RZS_UNCOMPRESSED,
-
-	/* Page consists entirely of zeros */
-	RZS_ZERO,
-
-	__NR_RZS_PAGEFLAGS,
-};
-
-/*-- Data structures */
-
-/* Indexed by page no. */
-struct table {
-	u32 pagenum;
-	u16 offset;
-	u8 count;	/* object ref count (not yet used) */
-	u8 flags;
-};
-
-struct ramzswap {
-	struct xv_pool *mem_pool;
-	void *compress_workmem;
-	void *compress_buffer;
-	struct table *table;
-	struct mutex lock;
-	struct gendisk *disk;
-	/*
-	 * This is limit on compressed data size (stats.compr_size)
-	 * Its applicable only when backing swap device is present.
-	 */
-	size_t memlimit;	/* bytes */
-	/*
-	 * This is limit on amount of *uncompressed* worth of data
-	 * we can hold. When backing swap device is provided, it is
-	 * set equal to device size.
-	 */
-	size_t disksize;	/* bytes */
-
-	/* backing swap device info */
-	struct block_device *backing_swap;
-	struct file *swap_file;
-	int old_block_size;
-};
-
-struct ramzswap_stats {
-	/* basic stats */
-	size_t compr_size;	/* compressed size of pages stored -
-				 * needed to enforce memlimit */
-	/* more stats */
-#if defined(STATS)
-	u64 num_reads;		/* failed + successful */
-	u64 num_writes;		/* --do-- */
-	u64 failed_reads;	/* can happen when memory is too low */
-	u64 failed_writes;	/* should NEVER! happen */
-	u64 invalid_io;		/* non-swap I/O requests */
-	u64 pages_discard;	/* no. of pages freed by discard callback */
-	u32 pages_zero;		/* no. of zero filled pages */
-	u32 pages_stored;	/* no. of pages currently stored */
-	u32 good_compress;	/* no. of pages with compression ratio<=50% */
-	u32 pages_expand;	/* no. of incompressible pages */
-	u64 bdev_num_reads;	/* no. of reads on backing dev */
-	u64 bdev_num_writes;	/* no. of writes on backing dev */
-#endif
-};
-/*-- */
-
-#endif
diff --git a/ubuntu/compcache/xvmalloc.c b/ubuntu/compcache/xvmalloc.c
deleted file mode 100644
index 222e1a9be03..00000000000
--- a/ubuntu/compcache/xvmalloc.c
+++ /dev/null
@@ -1,557 +0,0 @@
-/*
- * xvmalloc.c
- *
- * Copyright (C) 2008, 2009  Nitin Gupta
- *
- * This code is released using a dual license strategy: GPL/LGPL
- * You can choose the licence that better fits your requirements.
- *
- * Released under the terms of GNU General Public License Version 2.0
- * Released under the terms of GNU Lesser General Public License Version 2.1
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/bitops.h>
-#include <linux/errno.h>
-#include <linux/highmem.h>
-#include <linux/init.h>
-#include <linux/string.h>
-#include <linux/slab.h>
-
-#include "xvmalloc.h"
-#include "xvmalloc_int.h"
-
-static void stat_inc(u64 *value)
-{
-	*value = *value + 1;
-}
-
-static void stat_dec(u64 *value)
-{
-	*value = *value - 1;
-}
-
-static int test_flag(struct block_header *block, enum blockflags flag)
-{
-	return block->prev & BIT(flag);
-}
-
-static void set_flag(struct block_header *block, enum blockflags flag)
-{
-	block->prev |= BIT(flag);
-}
-
-static void clear_flag(struct block_header *block, enum blockflags flag)
-{
-	block->prev &= ~BIT(flag);
-}
-
-/*
- * Given <pagenum, offset> pair, provide a derefrencable pointer.
- * This is called from xv_malloc/xv_free path, so it needs to be fast.
- */
-static void *get_ptr_atomic(u32 pagenum, u16 offset, enum km_type type)
-{
-	unsigned char *base;
-
-	base = kmap_atomic(pfn_to_page(pagenum), type);
-	return base + offset;
-}
-
-static void put_ptr_atomic(void *ptr, enum km_type type)
-{
-	kunmap_atomic(ptr, type);
-}
-
-static u32 get_blockprev(struct block_header *block)
-{
-	return block->prev & PREV_MASK;
-}
-
-static void set_blockprev(struct block_header *block, u16 new_offset)
-{
-	block->prev = new_offset | (block->prev & FLAGS_MASK);
-}
-
-static struct block_header *BLOCK_NEXT(struct block_header *block)
-{
-	return (struct block_header *)((char *)block + block->size + XV_ALIGN);
-}
-
-/*
- * Get index of free list containing blocks of maximum size
- * which is less than or equal to given size.
- */
-static u32 get_index_for_insert(u32 size)
-{
-	if (unlikely(size > XV_MAX_ALLOC_SIZE))
-		size = XV_MAX_ALLOC_SIZE;
-	size &= ~FL_DELTA_MASK;
-	return (size - XV_MIN_ALLOC_SIZE) >> FL_DELTA_SHIFT;
-}
-
-/*
- * Get index of free list having blocks of size greater than
- * or equal to requested size.
- */
-static u32 get_index(u32 size)
-{
-	if (unlikely(size < XV_MIN_ALLOC_SIZE))
-		size = XV_MIN_ALLOC_SIZE;
-	size = ALIGN(size, FL_DELTA);
-	return (size - XV_MIN_ALLOC_SIZE) >> FL_DELTA_SHIFT;
-}
-
-/*
- * Allocate a memory page. Called when a pool needs to grow.
- */
-static u32 xv_alloc_page(gfp_t flags)
-{
-	struct page *page;
-
-	//page = alloc_page(GFP_NOIO | __GFP_HIGHMEM);
-	page = alloc_page(flags);
-	if (unlikely(!page))
-		return 0;
-
-	return page_to_pfn(page);
-}
-
-/*
- * Called when all objects in a page are freed.
- */
-static void xv_free_page(u32 pagenum)
-{
-	__free_page(pfn_to_page(pagenum));
-}
-
-/**
- * find_block - find block of at least given size
- * @pool: memory pool to search from
- * @size: size of block required
- * @pagenum: page no. containing required block
- * @offset: offset within the page where block is located.
- *
- * Searches two level bitmap to locate block of at least
- * the given size. If such a block is found, it provides
- * <pagenum, offset> to identify this block and returns index
- * in freelist where we found this block.
- * Otherwise, returns 0 and <pagenum, offset> params are not touched.
- */
-static u32 find_block(struct xv_pool *pool, u32 size,
-			u32 *pagenum, u32 *offset)
-{
-	ulong flbitmap, slbitmap;
-	u32 flindex, slindex, slbitstart;
-
-	/* There are no free blocks in this pool */
-	if (!pool->flbitmap)
-		return 0;
-
-	/* Get freelist index correspoding to this size */
-	slindex = get_index(size);
-	slbitmap = pool->slbitmap[slindex / BITS_PER_LONG];
-	slbitstart = slindex % BITS_PER_LONG;
-
-	/*
-	 * If freelist is not empty at this index, we found the
-	 * block - head of this list. This is approximate best-fit match.
-	 */
-	if (test_bit(slbitstart, &slbitmap)) {
-		*pagenum = pool->freelist[slindex].pagenum;
-		*offset = pool->freelist[slindex].offset;
-		return slindex;
-	}
-
-	/*
-	 * No best-fit found. Search a bit further in bitmap for a free block.
-	 * Second level bitmap consists of series of 32-bit chunks. Search
-	 * further in the chunk where we expected a best-fit, starting from
-	 * index location found above.
-	 */
-	slbitstart++;
-	slbitmap >>= slbitstart;
-
-	/* Skip this search if we were already at end of this bitmap chunk */
-	if ((slbitstart != BITS_PER_LONG) && slbitmap) {
-		slindex += __ffs(slbitmap) + 1;
-		*pagenum = pool->freelist[slindex].pagenum;
-		*offset = pool->freelist[slindex].offset;
-		return slindex;
-	}
-
-	/* Now do a full two-level bitmap search to find next nearest fit */
-	flindex = slindex / BITS_PER_LONG;
-
-	flbitmap = (pool->flbitmap) >> (flindex + 1);
-	if (!flbitmap)
-		return 0;
-
-	flindex += __ffs(flbitmap) + 1;
-	slbitmap = pool->slbitmap[flindex];
-	slindex = (flindex * BITS_PER_LONG) + __ffs(slbitmap);
-	*pagenum = pool->freelist[slindex].pagenum;
-	*offset = pool->freelist[slindex].offset;
-
-	return slindex;
-}
-
-/*
- * Insert block at <pagenum, offset> in freelist of given pool.
- * freelist used depends on block size.
- */
-static void insert_block(struct xv_pool *pool, u32 pagenum, u32 offset,
-			struct block_header *block)
-{
-	u32 flindex, slindex;
-	struct block_header *nextblock;
-
-	slindex = get_index_for_insert(block->size);
-	flindex = slindex / BITS_PER_LONG;
-
-	block->link.prev_pagenum = 0;
-	block->link.prev_offset = 0;
-	block->link.next_pagenum = pool->freelist[slindex].pagenum;
-	block->link.next_offset = pool->freelist[slindex].offset;
-	pool->freelist[slindex].pagenum = pagenum;
-	pool->freelist[slindex].offset = offset;
-
-	if (block->link.next_pagenum) {
-		nextblock = get_ptr_atomic(block->link.next_pagenum,
-					block->link.next_offset, KM_USER1);
-		nextblock->link.prev_pagenum = pagenum;
-		nextblock->link.prev_offset = offset;
-		put_ptr_atomic(nextblock, KM_USER1);
-	}
-
-	__set_bit(slindex % BITS_PER_LONG, &pool->slbitmap[flindex]);
-	__set_bit(flindex, &pool->flbitmap);
-}
-
-/*
- * Remove block from head of freelist. Index 'slindex' identifies the freelist.
- */
-static void remove_block_head(struct xv_pool *pool,
-			struct block_header *block, u32 slindex)
-{
-	struct block_header *tmpblock;
-	u32 flindex = slindex / BITS_PER_LONG;
-
-	pool->freelist[slindex].pagenum = block->link.next_pagenum;
-	pool->freelist[slindex].offset = block->link.next_offset;
-	block->link.prev_pagenum = 0;
-	block->link.prev_offset = 0;
-
-	if (!pool->freelist[slindex].pagenum) {
-		__clear_bit(slindex % BITS_PER_LONG, &pool->slbitmap[flindex]);
-		if (!pool->slbitmap[flindex])
-			__clear_bit(flindex, &pool->flbitmap);
-	} else {
-		/*
-		 * DEBUG ONLY: We need not reinitialize freelist head previous
-		 * pointer to 0 - we never depend on its value. But just for
-		 * sanity, lets do it.
-		 */
-		tmpblock = get_ptr_atomic(pool->freelist[slindex].pagenum,
-				pool->freelist[slindex].offset, KM_USER1);
-		tmpblock->link.prev_pagenum = 0;
-		tmpblock->link.prev_offset = 0;
-		put_ptr_atomic(tmpblock, KM_USER1);
-	}
-}
-
-/*
- * Remove block from freelist. Index 'slindex' identifies the freelist.
- */
-static void remove_block(struct xv_pool *pool, u32 pagenum, u32 offset,
-			struct block_header *block, u32 slindex)
-{
-	u32 flindex;
-	struct block_header *tmpblock;
-
-	if (pool->freelist[slindex].pagenum == pagenum
-	   && pool->freelist[slindex].offset == offset) {
-		remove_block_head(pool, block, slindex);
-		return;
-	}
-
-	flindex = slindex / BITS_PER_LONG;
-
-	if (block->link.prev_pagenum) {
-		tmpblock = get_ptr_atomic(block->link.prev_pagenum,
-				block->link.prev_offset, KM_USER1);
-		tmpblock->link.next_pagenum = block->link.next_pagenum;
-		tmpblock->link.next_offset = block->link.next_offset;
-		put_ptr_atomic(tmpblock, KM_USER1);
-	}
-
-	if (block->link.next_pagenum) {
-		tmpblock = get_ptr_atomic(block->link.next_pagenum,
-				block->link.next_offset, KM_USER1);
-		tmpblock->link.prev_pagenum = block->link.prev_pagenum;
-		tmpblock->link.prev_offset = block->link.prev_offset;
-		put_ptr_atomic(tmpblock, KM_USER1);
-	}
-
-	return;
-}
-
-/*
- * Allocate a page and add it freelist of given pool.
- */
-static int grow_pool(struct xv_pool *pool, gfp_t flags)
-{
-	u32 pagenum;
-	struct block_header *block;
-
-	pagenum = xv_alloc_page(flags);
-	if (unlikely(!pagenum))
-		return -ENOMEM;
-
-	stat_inc(&pool->total_pages);
-
-	spin_lock(&pool->lock);
-	block = get_ptr_atomic(pagenum, 0, KM_USER0);
-
-	block->size = PAGE_SIZE - XV_ALIGN;
-	set_flag(block, BLOCK_FREE);
-	clear_flag(block, PREV_FREE);
-	set_blockprev(block, 0);
-
-	insert_block(pool, pagenum, 0, block);
-
-	put_ptr_atomic(block, KM_USER0);
-	spin_unlock(&pool->lock);
-
-	return 0;
-}
-
-/*
- * Create a memory pool. Allocates freelist, bitmaps and other
- * per-pool metadata.
- */
-struct xv_pool *xv_create_pool(void)
-{
-	u32 ovhd_size;
-	struct xv_pool *pool;
-
-	ovhd_size = roundup(sizeof(*pool), PAGE_SIZE);
-	pool = kzalloc(ovhd_size, GFP_KERNEL);
-	if (!pool)
-		return NULL;
-
-	spin_lock_init(&pool->lock);
-
-	return pool;
-}
-EXPORT_SYMBOL_GPL(xv_create_pool);
-
-void xv_destroy_pool(struct xv_pool *pool)
-{
-	kfree(pool);
-}
-EXPORT_SYMBOL_GPL(xv_destroy_pool);
-
-/**
- * xv_malloc - Allocate block of given size from pool.
- * @pool: pool to allocate from
- * @size: size of block to allocate
- * @pagenum: page no. that holds the object
- * @offset: location of object within pagenum
- *
- * On success, <pagenum, offset> identifies block allocated
- * and 0 is returned. On failure, <pagenum, offset> is set to
- * 0 and -ENOMEM is returned.
- *
- * Allocation requests with size > XV_MAX_ALLOC_SIZE will fail.
- */
-int xv_malloc(struct xv_pool *pool, u32 size, u32 *pagenum, u32 *offset,
-							gfp_t flags)
-{
-	int error;
-	u32 index, tmpsize, origsize, tmpoffset;
-	struct block_header *block, *tmpblock;
-
-	*pagenum = 0;
-	*offset = 0;
-	origsize = size;
-
-	if (unlikely(!size || size > XV_MAX_ALLOC_SIZE))
-		return -ENOMEM;
-
-	size = ALIGN(size, XV_ALIGN);
-
-	spin_lock(&pool->lock);
-
-	index = find_block(pool, size, pagenum, offset);
-
-	if (!*pagenum) {
-		spin_unlock(&pool->lock);
-		if (flags & GFP_NOWAIT)
-			return -ENOMEM;
-		error = grow_pool(pool, flags);
-		if (unlikely(error))
-			return -ENOMEM;
-
-		spin_lock(&pool->lock);
-		index = find_block(pool, size, pagenum, offset);
-	}
-
-	if (!*pagenum) {
-		spin_unlock(&pool->lock);
-		return -ENOMEM;
-	}
-
-	block = get_ptr_atomic(*pagenum, *offset, KM_USER0);
-
-	remove_block_head(pool, block, index);
-
-	/* Split the block if required */
-	tmpoffset = *offset + size + XV_ALIGN;
-	tmpsize = block->size - size;
-	tmpblock = (struct block_header *)((char *)block + size + XV_ALIGN);
-	if (tmpsize) {
-		tmpblock->size = tmpsize - XV_ALIGN;
-		set_flag(tmpblock, BLOCK_FREE);
-		clear_flag(tmpblock, PREV_FREE);
-
-		set_blockprev(tmpblock, *offset);
-		if (tmpblock->size >= XV_MIN_ALLOC_SIZE)
-			insert_block(pool, *pagenum, tmpoffset, tmpblock);
-
-		if (tmpoffset + XV_ALIGN + tmpblock->size != PAGE_SIZE) {
-			tmpblock = BLOCK_NEXT(tmpblock);
-			set_blockprev(tmpblock, tmpoffset);
-		}
-	} else {
-		/* This block is exact fit */
-		if (tmpoffset != PAGE_SIZE)
-			clear_flag(tmpblock, PREV_FREE);
-	}
-
-	block->size = origsize;
-	clear_flag(block, BLOCK_FREE);
-
-	put_ptr_atomic(block, KM_USER0);
-	spin_unlock(&pool->lock);
-
-	*offset += XV_ALIGN;
-
-	return 0;
-}
-EXPORT_SYMBOL_GPL(xv_malloc);
-
-/*
- * Free block identified with <pagenum, offset>
- */
-void xv_free(struct xv_pool *pool, u32 pagenum, u32 offset)
-{
-	void *page;
-	struct block_header *block, *tmpblock;
-
-	offset -= XV_ALIGN;
-
-	spin_lock(&pool->lock);
-
-	page = get_ptr_atomic(pagenum, 0, KM_USER0);
-	block = (struct block_header *)((char *)page + offset);
-
-	/* Catch double free bugs */
-	BUG_ON(test_flag(block, BLOCK_FREE));
-
-	block->size = ALIGN(block->size, XV_ALIGN);
-
-	tmpblock = BLOCK_NEXT(block);
-	if (offset + block->size + XV_ALIGN == PAGE_SIZE)
-		tmpblock = NULL;
-
-	/* Merge next block if its free */
-	if (tmpblock && test_flag(tmpblock, BLOCK_FREE)) {
-		/*
-		 * Blocks smaller than XV_MIN_ALLOC_SIZE
-		 * are not inserted in any free list.
-		 */
-		if (tmpblock->size >= XV_MIN_ALLOC_SIZE) {
-			remove_block(pool, pagenum,
-				    offset + block->size + XV_ALIGN, tmpblock,
-				    get_index_for_insert(tmpblock->size));
-		}
-		block->size += tmpblock->size + XV_ALIGN;
-	}
-
-	/* Merge previous block if its free */
-	if (test_flag(block, PREV_FREE)) {
-		tmpblock = (struct block_header *)((char *)(page) +
-						get_blockprev(block));
-		offset = offset - tmpblock->size - XV_ALIGN;
-
-		if (tmpblock->size >= XV_MIN_ALLOC_SIZE)
-			remove_block(pool, pagenum, offset, tmpblock,
-				    get_index_for_insert(tmpblock->size));
-
-		tmpblock->size += block->size + XV_ALIGN;
-		block = tmpblock;
-	}
-
-	/* No used objects in this page. Free it. */
-	if (block->size == PAGE_SIZE - XV_ALIGN) {
-		put_ptr_atomic(page, KM_USER0);
-		spin_unlock(&pool->lock);
-
-		xv_free_page(pagenum);
-		stat_dec(&pool->total_pages);
-		return;
-	}
-
-	set_flag(block, BLOCK_FREE);
-	if (block->size >= XV_MIN_ALLOC_SIZE)
-		insert_block(pool, pagenum, offset, block);
-
-	if (offset + block->size + XV_ALIGN != PAGE_SIZE) {
-		tmpblock = BLOCK_NEXT(block);
-		set_flag(tmpblock, PREV_FREE);
-		set_blockprev(tmpblock, offset);
-	}
-
-	put_ptr_atomic(page, KM_USER0);
-	spin_unlock(&pool->lock);
-
-	return;
-}
-EXPORT_SYMBOL_GPL(xv_free);
-
-u32 xv_get_object_size(void *obj)
-{
-	struct block_header *blk;
-
-	blk = (struct block_header *)((char *)(obj) - XV_ALIGN);
-	return blk->size;
-}
-EXPORT_SYMBOL_GPL(xv_get_object_size);
-
-/*
- * Returns total memory used by allocator (userdata + metadata)
- */
-u64 xv_get_total_size_bytes(struct xv_pool *pool)
-{
-	return pool->total_pages << PAGE_SHIFT;
-}
-EXPORT_SYMBOL_GPL(xv_get_total_size_bytes);
-
-static int __init xv_malloc_init(void)
-{
-	return 0;
-}
-
-static void __exit xv_malloc_exit(void)
-{
-	return;
-}
-
-module_init(xv_malloc_init);
-module_exit(xv_malloc_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Nitin Gupta <ngupta@vflare.org>");
-MODULE_DESCRIPTION("xvmalloc memory allocator");
diff --git a/ubuntu/compcache/xvmalloc.h b/ubuntu/compcache/xvmalloc.h
deleted file mode 100644
index f966aa79e21..00000000000
--- a/ubuntu/compcache/xvmalloc.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * xvmalloc.h
- *
- * Copyright (C) 2008, 2009  Nitin Gupta
- *
- * This code is released using a dual license strategy: GPL/LGPL
- * You can choose the licence that better fits your requirements.
- *
- * Released under the terms of GNU General Public License Version 2.0
- * Released under the terms of GNU Lesser General Public License Version 2.1
- */
-
-#ifndef _XVMALLOC_H_
-#define _XVMALLOC_H_
-
-#include <linux/types.h>
-
-struct xv_pool;
-
-struct xv_pool *xv_create_pool(void);
-void xv_destroy_pool(struct xv_pool *pool);
-
-int xv_malloc(struct xv_pool *pool, u32 size, u32 *pagenum, u32 *offset,
-							gfp_t flags);
-void xv_free(struct xv_pool *pool, u32 pagenum, u32 offset);
-
-u32 xv_get_object_size(void *obj);
-u64 xv_get_total_size_bytes(struct xv_pool *pool);
-
-#endif
diff --git a/ubuntu/compcache/xvmalloc_int.h b/ubuntu/compcache/xvmalloc_int.h
deleted file mode 100644
index c09d8e75f1a..00000000000
--- a/ubuntu/compcache/xvmalloc_int.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * xvmalloc_int.c
- *
- * Copyright (C) 2008, 2009  Nitin Gupta
- *
- * This code is released using a dual license strategy: GPL/LGPL
- * You can choose the licence that better fits your requirements.
- *
- * Released under the terms of GNU General Public License Version 2.0
- * Released under the terms of GNU Lesser General Public License Version 2.1
- */
-
-#ifndef _XVMALLOC_INT_H_
-#define _XVMALLOC_INT_H_
-
-#include <linux/kernel.h>
-#include <linux/types.h>
-
-/* User configurable params */
-
-/* This must be greater than sizeof(LinkFree) */
-#define XV_MIN_ALLOC_SIZE       32
-#define XV_MAX_ALLOC_SIZE       (PAGE_SIZE - XV_ALIGN)
-
-/* Must be power of two */
-#define XV_ALIGN_SHIFT	2
-#define XV_ALIGN	(1 << XV_ALIGN_SHIFT)
-#define XV_ALIGN_MASK	(XV_ALIGN - 1)
-
-/* Free lists are separated by FL_DELTA bytes */
-#define FL_DELTA_SHIFT	3
-#define FL_DELTA	(1 << FL_DELTA_SHIFT)
-#define FL_DELTA_MASK	(FL_DELTA - 1)
-#define NUM_FREE_LISTS	((XV_MAX_ALLOC_SIZE - XV_MIN_ALLOC_SIZE) \
-				/ FL_DELTA + 1)
-
-#define MAX_FLI		DIV_ROUND_UP(NUM_FREE_LISTS, BITS_PER_LONG)
-
-/* End of user params */
-
-enum blockflags {
-	BLOCK_FREE,
-	PREV_FREE,
-	__NR_BLOCKFLAGS,
-};
-
-#define FLAGS_MASK	XV_ALIGN_MASK
-#define PREV_MASK	(~FLAGS_MASK)
-
-struct freelist_entry {
-	u32 pagenum;
-	u16 offset;
-	u16 pad;
-};
-
-struct link_free {
-	u32 prev_pagenum;
-	u32 next_pagenum;
-	u16 prev_offset;
-	u16 next_offset;
-};
-
-struct block_header {
-	union {
-		/* This common header must be ALIGN bytes */
-		u8 common[XV_ALIGN];
-		struct {
-			u16 size;
-			u16 prev;
-		};
-	};
-	struct link_free link;
-};
-
-struct xv_pool {
-	ulong flbitmap;
-	ulong slbitmap[MAX_FLI];
-	spinlock_t lock;
-
-	struct freelist_entry freelist[NUM_FREE_LISTS];
-
-	/* stats */
-	u64 total_pages;
-};
-
-#endif