Commit 5c9cfd19 authored by Anton Altaparmakov's avatar Anton Altaparmakov

Merge cantab.net:/home/src/ntfs-2.6

into cantab.net:/home/src/ntfs-2.6-devel
parents a4f528d2 8dd70853
......@@ -66,13 +66,12 @@ _GLOBAL(strlen)
blr
_GLOBAL(memset)
neg r0,r5
neg r0,r3
rlwimi r4,r4,8,16,23
andi. r0,r0,7 /* # bytes to be 8-byte aligned */
rlwimi r4,r4,16,0,15
cmplw cr1,r5,r0 /* do we get that far? */
rldimi r4,r4,32,0
mr r6,r3
mtcrf 1,r0
mr r6,r3
blt cr1,8f
......
......@@ -2895,7 +2895,6 @@ drop_buffers(struct page *page, struct buffer_head **buffers_to_free)
{
struct buffer_head *head = page_buffers(page);
struct buffer_head *bh;
int was_uptodate = 1;
bh = head;
do {
......@@ -2903,8 +2902,6 @@ drop_buffers(struct page *page, struct buffer_head **buffers_to_free)
set_bit(AS_EIO, &page->mapping->flags);
if (buffer_busy(bh))
goto failed;
if (!buffer_uptodate(bh) && !buffer_req(bh))
was_uptodate = 0;
bh = bh->b_this_page;
} while (bh != head);
......
......@@ -108,7 +108,7 @@ typedef struct {
#endif
} efi_memory_desc_t;
typedef int efi_freemem_callback_t (unsigned long start, unsigned long end, void *arg);
typedef int (*efi_freemem_callback_t) (unsigned long start, unsigned long end, void *arg);
/*
* Types and defines for Time Services
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment