- support-piping-into-commands-in-proc-sys-kernel-core_pattern-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled

     support-piping-into-commands-in-proc-sys-kernel-core_pattern-fix

has been removed from the -mm tree.  Its filename is

     support-piping-into-commands-in-proc-sys-kernel-core_pattern-fix.patch

This patch was dropped because it was folded into support-piping-into-commands-in-proc-sys-kernel-core_pattern.patch

------------------------------------------------------
Subject: support-piping-into-commands-in-proc-sys-kernel-core_pattern-fix
From: Andrew Morton <akpm@xxxxxxxx>

loff_t != unsigned long

Cc: Andi Kleen <ak@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 fs/binfmt_elf.c |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff -puN fs/binfmt_elf.c~support-piping-into-commands-in-proc-sys-kernel-core_pattern-fix fs/binfmt_elf.c
--- a/fs/binfmt_elf.c~support-piping-into-commands-in-proc-sys-kernel-core_pattern-fix
+++ a/fs/binfmt_elf.c
@@ -1218,14 +1218,15 @@ static int notesize(struct memelfnote *e
 #define DUMP_WRITE(addr, nr, foffset)	\
 	do { if (!dump_write(file, (addr), (nr))) return 0; *foffset += (nr); } while(0)
 
-static int alignfile(struct file *file, unsigned long *foffset)
+static int alignfile(struct file *file, loff_t *foffset)
 {
 	char buf[4] = { 0, };
 	DUMP_WRITE(buf, roundup(*foffset, 4) - *foffset, foffset);
 	return 1;
 }
 
-static int writenote(struct memelfnote *men, struct file *file, unsigned long *foffset)
+static int writenote(struct memelfnote *men, struct file *file,
+			loff_t *foffset)
 {
 	struct elf_note en;
 	en.n_namesz = strlen(men->name) + 1;
@@ -1234,9 +1235,11 @@ static int writenote(struct memelfnote *
 
 	DUMP_WRITE(&en, sizeof(en), foffset);
 	DUMP_WRITE(men->name, en.n_namesz, foffset);
-	if (!alignfile(file, foffset)) return 0;
+	if (!alignfile(file, foffset))
+		return 0;
 	DUMP_WRITE(men->data, men->datasz, foffset);
-	if (!alignfile(file, foffset)) return 0;
+	if (!alignfile(file, foffset))
+		return 0;
 
 	return 1;
 }
_

Patches currently in -mm which might be from akpm@xxxxxxxx are

origin.patch
list_del-debug-fix.patch
arch-i386-pci-mmconfigc-tlb-flush-fix-tweaks.patch
maximum-latency-tracking-infrastructure.patch
submit-checklist-mention-headers_check.patch
ntp-move-all-the-ntp-related-code-to-ntpc.patch
reiserfs-on-demand-bitmap-loading.patch
add-vector-aio-support.patch
stack-overflow-safe-kdump-crash_use_safe_smp_processor_id.patch
generic-ioremap_page_range-x86_64-conversion.patch
some-cleanup-in-the-pipe-code.patch
support-piping-into-commands-in-proc-sys-kernel-core_pattern.patch
support-piping-into-commands-in-proc-sys-kernel-core_pattern-fix.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux