A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-12 15:49:17 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "mm: fix struct page layout on 32-bit systems"

Browse source 
This reverts commit ecdf893c5a as it
breaks the kernel abi and it's nothing we care about in Android GKI
systems as they are all 64bit kernels.

Bug: 161946584
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ib077886a965010f3b649776ee3e4ded5c64e59ae
This commit is contained in:
Greg Kroah-Hartman 2021-05-19 18:10:03 +02:00
commit e63f97bf02
3 changed files with 6 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/linux/mm_types.h
View file

@ -97,10 +97,10 @@ struct page {
};
struct { /* page_pool used by netstack */
/**
* @dma_addr: might require a 64-bit value on
* @dma_addr: might require a 64-bit value even on
* 32-bit architectures.
*/
unsigned long dma_addr[2];
dma_addr_t dma_addr;
};
struct { /* slab, slob and slub */
union {

12
include/net/page_pool.h
View file

@ -185,17 +185,7 @@ static inline void page_pool_release_page(struct page_pool *pool,
static inline dma_addr_t page_pool_get_dma_addr(struct page *page)
{
dma_addr_t ret = page->dma_addr[0];
if (sizeof(dma_addr_t) > sizeof(unsigned long))
ret |= (dma_addr_t)page->dma_addr[1] << 16 << 16;
return ret;
}
static inline void page_pool_set_dma_addr(struct page *page, dma_addr_t addr)
{
page->dma_addr[0] = addr;
if (sizeof(dma_addr_t) > sizeof(unsigned long))
page->dma_addr[1] = upper_32_bits(addr);
return page->dma_addr;
}
static inline bool is_page_pool_compiled_in(void)

6
net/core/page_pool.c
View file

@ -157,7 +157,7 @@ static struct page *__page_pool_alloc_pages_slow(struct page_pool *pool,
put_page(page);
return NULL;
}
page_pool_set_dma_addr(page, dma);
page->dma_addr = dma;
skip_dma_map:
/* Track how many pages are held 'in-flight' */
@ -216,12 +216,12 @@ static void __page_pool_clean_page(struct page_pool *pool,
if (!(pool->p.flags & PP_FLAG_DMA_MAP))
goto skip_dma_unmap;
dma = page_pool_get_dma_addr(page);
dma = page->dma_addr;
/* DMA unmap */
dma_unmap_page_attrs(pool->p.dev, dma,
PAGE_SIZE << pool->p.order, pool->p.dma_dir,
DMA_ATTR_SKIP_CPU_SYNC);
page_pool_set_dma_addr(page, 0);
page->dma_addr = 0;
skip_dma_unmap:
/* This may be the last page returned, releasing the pool, so
* it is not safe to reference pool afterwards.