Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98a38a5d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus 

* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
  params.c: Use new strtobool function to process boolean inputs
  debugfs: move to new strtobool
  Add a strtobool function matching semantics of existing in kernel equivalents
  modpost: Update 64k section support for binutils 2.18.50
  module: Use binary search in lookup_symbol()
  module: Use the binary search for symbols resolution
  lib: Add generic binary search function to the kernel.
  module: Sort exported symbols
  module: each_symbol_section instead of each_symbol
  module: split unset_section_ro_nx function.
  module: undo module RONX protection correctly.
  module: zero mod->init_ro_size after init is freed.
  minor ANSI prototype sparse fix
  module: reorder kparam_array to remove alignment padding on 64 bit builds
  module: remove 64 bit alignment padding from struct module with CONFIG_TRACE*
  module: do not hide __modver_version_show declaration behind ifdef
  module: deal with alignment issues in built-in module versions
parents 7663164f f721a465

arch/s390/include/asm/cacheflush.h

+1 −0
Original line number Diff line number Diff line
@@ -11,5 +11,6 @@ void kernel_map_pages(struct page *page, int numpages, int enable); 
int set_memory_ro(unsigned long addr, int numpages);

int set_memory_rw(unsigned long addr, int numpages);

int set_memory_nx(unsigned long addr, int numpages);

int set_memory_x(unsigned long addr, int numpages);



#endif /* _S390_CACHEFLUSH_H */

arch/s390/mm/pageattr.c

+5 −0
Original line number Diff line number Diff line
@@ -54,3 +54,8 @@ int set_memory_nx(unsigned long addr, int numpages) 
	return 0;

}

EXPORT_SYMBOL_GPL(set_memory_nx);



int set_memory_x(unsigned long addr, int numpages)

{

	return 0;

}

fs/debugfs/file.c

+4 −13
Original line number Diff line number Diff line
@@ -429,24 +429,15 @@ static ssize_t write_file_bool(struct file *file, const char __user *user_buf, 
{

	char buf[32];

	int buf_size;

	bool bv;

	u32 *val = file->private_data;



	buf_size = min(count, (sizeof(buf)-1));

	if (copy_from_user(buf, user_buf, buf_size))

		return -EFAULT;



	switch (buf[0]) {

	case 'y':

	case 'Y':

	case '1':

		*val = 1;

		break;

	case 'n':

	case 'N':

	case '0':

		*val = 0;

		break;

	}

	if (strtobool(buf, &bv) == 0)

		*val = bv;



	return count;

}

include/asm-generic/vmlinux.lds.h

+10 −10
Original line number Diff line number Diff line
@@ -274,70 +274,70 @@ 
	/* Kernel symbol table: Normal symbols */			\

	__ksymtab         : AT(ADDR(__ksymtab) - LOAD_OFFSET) {		\

		VMLINUX_SYMBOL(__start___ksymtab) = .;			\

		*(__ksymtab)						\

		*(SORT(___ksymtab+*))					\

		VMLINUX_SYMBOL(__stop___ksymtab) = .;			\

	}								\

									\

	/* Kernel symbol table: GPL-only symbols */			\

	__ksymtab_gpl     : AT(ADDR(__ksymtab_gpl) - LOAD_OFFSET) {	\

		VMLINUX_SYMBOL(__start___ksymtab_gpl) = .;		\

		*(__ksymtab_gpl)					\

		*(SORT(___ksymtab_gpl+*))				\

		VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .;		\

	}								\

									\

	/* Kernel symbol table: Normal unused symbols */		\

	__ksymtab_unused  : AT(ADDR(__ksymtab_unused) - LOAD_OFFSET) {	\

		VMLINUX_SYMBOL(__start___ksymtab_unused) = .;		\

		*(__ksymtab_unused)					\

		*(SORT(___ksymtab_unused+*))				\

		VMLINUX_SYMBOL(__stop___ksymtab_unused) = .;		\

	}								\

									\

	/* Kernel symbol table: GPL-only unused symbols */		\

	__ksymtab_unused_gpl : AT(ADDR(__ksymtab_unused_gpl) - LOAD_OFFSET) { \

		VMLINUX_SYMBOL(__start___ksymtab_unused_gpl) = .;	\

		*(__ksymtab_unused_gpl)					\

		*(SORT(___ksymtab_unused_gpl+*))			\

		VMLINUX_SYMBOL(__stop___ksymtab_unused_gpl) = .;	\

	}								\

									\

	/* Kernel symbol table: GPL-future-only symbols */		\

	__ksymtab_gpl_future : AT(ADDR(__ksymtab_gpl_future) - LOAD_OFFSET) { \

		VMLINUX_SYMBOL(__start___ksymtab_gpl_future) = .;	\

		*(__ksymtab_gpl_future)					\

		*(SORT(___ksymtab_gpl_future+*))			\

		VMLINUX_SYMBOL(__stop___ksymtab_gpl_future) = .;	\

	}								\

									\

	/* Kernel symbol table: Normal symbols */			\

	__kcrctab         : AT(ADDR(__kcrctab) - LOAD_OFFSET) {		\

		VMLINUX_SYMBOL(__start___kcrctab) = .;			\

		*(__kcrctab)						\

		*(SORT(___kcrctab+*))					\

		VMLINUX_SYMBOL(__stop___kcrctab) = .;			\

	}								\

									\

	/* Kernel symbol table: GPL-only symbols */			\

	__kcrctab_gpl     : AT(ADDR(__kcrctab_gpl) - LOAD_OFFSET) {	\

		VMLINUX_SYMBOL(__start___kcrctab_gpl) = .;		\

		*(__kcrctab_gpl)					\

		*(SORT(___kcrctab_gpl+*))				\

		VMLINUX_SYMBOL(__stop___kcrctab_gpl) = .;		\

	}								\

									\

	/* Kernel symbol table: Normal unused symbols */		\

	__kcrctab_unused  : AT(ADDR(__kcrctab_unused) - LOAD_OFFSET) {	\

		VMLINUX_SYMBOL(__start___kcrctab_unused) = .;		\

		*(__kcrctab_unused)					\

		*(SORT(___kcrctab_unused+*))				\

		VMLINUX_SYMBOL(__stop___kcrctab_unused) = .;		\

	}								\

									\

	/* Kernel symbol table: GPL-only unused symbols */		\

	__kcrctab_unused_gpl : AT(ADDR(__kcrctab_unused_gpl) - LOAD_OFFSET) { \

		VMLINUX_SYMBOL(__start___kcrctab_unused_gpl) = .;	\

		*(__kcrctab_unused_gpl)					\

		*(SORT(___kcrctab_unused_gpl+*))			\

		VMLINUX_SYMBOL(__stop___kcrctab_unused_gpl) = .;	\

	}								\

									\

	/* Kernel symbol table: GPL-future-only symbols */		\

	__kcrctab_gpl_future : AT(ADDR(__kcrctab_gpl_future) - LOAD_OFFSET) { \

		VMLINUX_SYMBOL(__start___kcrctab_gpl_future) = .;	\

		*(__kcrctab_gpl_future)					\

		*(SORT(___kcrctab_gpl_future+*))			\

		VMLINUX_SYMBOL(__stop___kcrctab_gpl_future) = .;	\

	}								\

									\

include/linux/bsearch.h

0 → 100644
+9 −0
Original line number Diff line number Diff line 
#ifndef _LINUX_BSEARCH_H

#define _LINUX_BSEARCH_H



#include <linux/types.h>



void *bsearch(const void *key, const void *base, size_t num, size_t size,

	      int (*cmp)(const void *key, const void *elt));



#endif /* _LINUX_BSEARCH_H */