2 files changed, 3 insertions, 48 deletions
diff --git a/include/asm-generic/dma-contiguous.h b/include/asm-generic/dma-contiguous.h
index c544356b374..294b1e755ab 100644
--- a/include/asm-generic/dma-contiguous.h
+++ b/include/asm-generic/dma-contiguous.h
@@ -18,7 +18,7 @@ static inline void dev_set_cma_area(struct device *dev, struct cma *cma)
 {
        if (dev)
                dev->cma_area = cma;
-        if (!dev || !dma_contiguous_default_area)
+        if (!dev && !dma_contiguous_default_area)
                dma_contiguous_default_area = cma;
 }
diff --git a/include/asm-generic/sizes.h b/include/asm-generic/sizes.h
index ea5d4ef8106..1dcfad9629e 100644
--- a/include/asm-generic/sizes.h
+++ b/include/asm-generic/sizes.h
@@ -1,47 +1,2 @@
-/*
+/* This is a placeholder, to be removed over time */
- * linux/include/asm-generic/sizes.h
+#include <linux/sizes.h>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef __ASM_GENERIC_SIZES_H__
-#define __ASM_GENERIC_SIZES_H__
-#define SZ_1                            0x00000001
-#define SZ_2                            0x00000002
-#define SZ_4                            0x00000004
-#define SZ_8                            0x00000008
-#define SZ_16                           0x00000010
-#define SZ_32                           0x00000020
-#define SZ_64                           0x00000040
-#define SZ_128                          0x00000080
-#define SZ_256                          0x00000100
-#define SZ_512                          0x00000200
-#define SZ_1K                           0x00000400
-#define SZ_2K                           0x00000800
-#define SZ_4K                           0x00001000
-#define SZ_8K                           0x00002000
-#define SZ_16K                          0x00004000
-#define SZ_32K                          0x00008000
-#define SZ_64K                          0x00010000
-#define SZ_128K                         0x00020000
-#define SZ_256K                         0x00040000
-#define SZ_512K                         0x00080000
-#define SZ_1M                           0x00100000
-#define SZ_2M                           0x00200000
-#define SZ_4M                           0x00400000
-#define SZ_8M                           0x00800000
-#define SZ_16M                          0x01000000
-#define SZ_32M                          0x02000000
-#define SZ_64M                          0x04000000
-#define SZ_128M                         0x08000000
-#define SZ_256M                         0x10000000
-#define SZ_512M                         0x20000000
-#define SZ_1G                           0x40000000
-#define SZ_2G                           0x80000000
-#endif /* __ASM_GENERIC_SIZES_H__ */

diff --git a/include/asm-generic/dma-contiguous.h b/include/asm-generic/dma-contiguous.h index c544356b374..294b1e755ab 100644 --- a/include/asm-generic/dma-contiguous.h +++ b/include/asm-generic/dma-contiguous.h
@@ -18,7 +18,7 @@ static inline void dev_set_cma_area(struct device dev, struct cma cma)
18	{	18	{
19	if (dev)	19	if (dev)
20	dev->cma_area = cma;	20	dev->cma_area = cma;
21	if (!dev \|\| !dma_contiguous_default_area)	21	if (!dev && !dma_contiguous_default_area)
22	dma_contiguous_default_area = cma;	22	dma_contiguous_default_area = cma;
23	}	23	}
24		24


diff --git a/include/asm-generic/sizes.h b/include/asm-generic/sizes.h index ea5d4ef8106..1dcfad9629e 100644 --- a/include/asm-generic/sizes.h +++ b/include/asm-generic/sizes.h
@@ -1,47 +1,2 @@
1	/*	1	/* This is a placeholder, to be removed over time */
2	* linux/include/asm-generic/sizes.h	2	#include <linux/sizes.h>
3	*
4	* This program is free software; you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License version 2 as
6	* published by the Free Software Foundation.
7	*/
8	#ifndef __ASM_GENERIC_SIZES_H__
9	#define __ASM_GENERIC_SIZES_H__
10
11	#define SZ_1 0x00000001
12	#define SZ_2 0x00000002
13	#define SZ_4 0x00000004
14	#define SZ_8 0x00000008
15	#define SZ_16 0x00000010
16	#define SZ_32 0x00000020
17	#define SZ_64 0x00000040
18	#define SZ_128 0x00000080
19	#define SZ_256 0x00000100
20	#define SZ_512 0x00000200
21
22	#define SZ_1K 0x00000400
23	#define SZ_2K 0x00000800
24	#define SZ_4K 0x00001000
25	#define SZ_8K 0x00002000
26	#define SZ_16K 0x00004000
27	#define SZ_32K 0x00008000
28	#define SZ_64K 0x00010000
29	#define SZ_128K 0x00020000
30	#define SZ_256K 0x00040000
31	#define SZ_512K 0x00080000
32
33	#define SZ_1M 0x00100000
34	#define SZ_2M 0x00200000
35	#define SZ_4M 0x00400000
36	#define SZ_8M 0x00800000
37	#define SZ_16M 0x01000000
38	#define SZ_32M 0x02000000
39	#define SZ_64M 0x04000000
40	#define SZ_128M 0x08000000
41	#define SZ_256M 0x10000000
42	#define SZ_512M 0x20000000
43
44	#define SZ_1G 0x40000000
45	#define SZ_2G 0x80000000
46
47	#endif /* __ASM_GENERIC_SIZES_H__ */