apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge 3.4-rc5 into staging-next

Browse Source 
This resolves the conflict in:
	drivers/staging/vt6656/ioctl.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2012-05-02 11:48:07 -07:00
parent 69964ea4c7 5bb196ad29
commit d210267741
447 changed files with 12264 additions and 13438 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/staging/zsmalloc/zsmalloc-main.c
+4 -5
View File
@@ -45,12 +45,12 @@ static DEFINE_PER_CPU(struct mapping_area, zs_map_area);
static int is_first_page(struct page *page)
{
return test_bit(PG_private, &page->flags);
return PagePrivate(page);
}
static int is_last_page(struct page *page)
{
return test_bit(PG_private_2, &page->flags);
return PagePrivate2(page);
}
static void get_zspage_mapping(struct page *page, unsigned int *class_idx,
@@ -377,7 +377,7 @@ static struct page *alloc_zspage(struct size_class *class, gfp_t flags)
INIT_LIST_HEAD(&page->lru);
if (i == 0) { /* first page */
set_bit(PG_private, &page->flags);
SetPagePrivate(page);
set_page_private(page, 0);
first_page = page;
first_page->inuse = 0;
@@ -389,8 +389,7 @@ static struct page *alloc_zspage(struct size_class *class, gfp_t flags)
if (i >= 2)
list_add(&page->lru, &prev_page->lru);
if (i == class->zspage_order - 1) /* last page */
set_bit(PG_private_2, &page->flags);
SetPagePrivate2(page);
prev_page = page;
}