diff options
| author | Konrad Rzeszutek Wilk | 2013-05-08 21:16:23 +0200 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk | 2013-05-15 16:27:43 +0200 |
| commit | a5e9cd952e2ee215286ea3ec5e6b3aa669e04e0e (patch) | |
| tree | f048b8132f1838409cd107ded95f260811c2b5bc | |
| parent | Merge tag 'v3.10-rc1' into stable/for-linus-3.10 (diff) | |
| download | kernel-qcow2-linux-a5e9cd952e2ee215286ea3ec5e6b3aa669e04e0e.tar.gz kernel-qcow2-linux-a5e9cd952e2ee215286ea3ec5e6b3aa669e04e0e.tar.xz kernel-qcow2-linux-a5e9cd952e2ee215286ea3ec5e6b3aa669e04e0e.zip | |
xen/tmem: Cleanup. Remove the parts that say temporary.
Frontswap is upstream, no need to having this #ifdef.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
| -rw-r--r-- | drivers/xen/tmem.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/xen/tmem.c b/drivers/xen/tmem.c index e3600be4e7fa..5686d6d1a4b5 100644 --- a/drivers/xen/tmem.c +++ b/drivers/xen/tmem.c @@ -11,11 +11,7 @@ #include <linux/init.h> #include <linux/pagemap.h> #include <linux/cleancache.h> - -/* temporary ifdef until include/linux/frontswap.h is upstream */ -#ifdef CONFIG_FRONTSWAP #include <linux/frontswap.h> -#endif #include <xen/xen.h> #include <xen/interface/xen.h> |