Skip to content

L
linux
Commit 9354a55f authored by Tony Luck's avatar Tony Luck
Browse files
Options

Pull misc2-6-36 into release branch

parents 38e14a7c ba58aebf
Show whitespace changes
Inline Side-by-side
Showing with 200 additions and 184 deletions
arch/ia64/kernel/perfmon.c
View file @ 9354a55f
...@@ -1696,8 +1696,8 @@ pfm_poll(struct file *filp, poll_table * wait) ...@@ -1696,8 +1696,8 @@ pfm_poll(struct file *filp, poll_table * wait)
return mask; return mask;
} }
static int static long
pfm_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) pfm_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{ {
DPRINT(("pfm_ioctl called\n")); DPRINT(("pfm_ioctl called\n"));
return -EINVAL; return -EINVAL;
...@@ -2178,7 +2178,7 @@ static const struct file_operations pfm_file_ops = { ...@@ -2178,7 +2178,7 @@ static const struct file_operations pfm_file_ops = {
.read = pfm_read, .read = pfm_read,
.write = pfm_write, .write = pfm_write,
.poll = pfm_poll, .poll = pfm_poll,
.ioctl = pfm_ioctl, .unlocked_ioctl = pfm_ioctl,
.open = pfm_no_open, /* special open code to disallow open via /proc */ .open = pfm_no_open, /* special open code to disallow open via /proc */
.fasync = pfm_fasync, .fasync = pfm_fasync,
.release = pfm_close, .release = pfm_close,
......
arch/ia64/kernel/vmlinux.lds.S
View file @ 9354a55f
...@@ -6,15 +6,11 @@ ...@@ -6,15 +6,11 @@
#include <asm-generic/vmlinux.lds.h> #include <asm-generic/vmlinux.lds.h>
#define IVT_TEXT \
VMLINUX_SYMBOL(__start_ivt_text) = .; \
*(.text..ivt) \
VMLINUX_SYMBOL(__end_ivt_text) = .;
OUTPUT_FORMAT("elf64-ia64-little") OUTPUT_FORMAT("elf64-ia64-little")
OUTPUT_ARCH(ia64) OUTPUT_ARCH(ia64)
ENTRY(phys_start) ENTRY(phys_start)
jiffies = jiffies_64; jiffies = jiffies_64;
PHDRS { PHDRS {
code PT_LOAD; code PT_LOAD;
percpu PT_LOAD; percpu PT_LOAD;
...@@ -22,10 +18,12 @@ PHDRS { ...@@ -22,10 +18,12 @@ PHDRS {
note PT_NOTE; note PT_NOTE;
unwind 0x70000001; /* PT_IA_64_UNWIND, but ld doesn't match the name */ unwind 0x70000001; /* PT_IA_64_UNWIND, but ld doesn't match the name */
} }
SECTIONS
{ SECTIONS {
/* unwind exit sections must be discarded before the rest of the /*
sections get included. */ * unwind exit sections must be discarded before
* the rest of the sections get included.
*/
/DISCARD/ : { /DISCARD/ : {
*(.IA_64.unwind.exit.text) *(.IA_64.unwind.exit.text)
*(.IA_64.unwind_info.exit.text) *(.IA_64.unwind_info.exit.text)
...@@ -36,96 +34,104 @@ SECTIONS ...@@ -36,96 +34,104 @@ SECTIONS
v = PAGE_OFFSET; /* this symbol is here to make debugging easier... */ v = PAGE_OFFSET; /* this symbol is here to make debugging easier... */
phys_start = _start - LOAD_OFFSET; phys_start = _start - LOAD_OFFSET;
code : { } :code code : {
} :code
. = KERNEL_START; . = KERNEL_START;
_text = .; _text = .;
_stext = .; _stext = .;
.text : AT(ADDR(.text) - LOAD_OFFSET) .text : AT(ADDR(.text) - LOAD_OFFSET) {
{ __start_ivt_text = .;
IVT_TEXT *(.text..ivt)
__end_ivt_text = .;
TEXT_TEXT TEXT_TEXT
SCHED_TEXT SCHED_TEXT
LOCK_TEXT LOCK_TEXT
KPROBES_TEXT KPROBES_TEXT
*(.gnu.linkonce.t*) *(.gnu.linkonce.t*)
} }
.text2 : AT(ADDR(.text2) - LOAD_OFFSET)
{ *(.text2) } .text2 : AT(ADDR(.text2) - LOAD_OFFSET) {
*(.text2)
}
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
.text..lock : AT(ADDR(.text..lock) - LOAD_OFFSET) .text..lock : AT(ADDR(.text..lock) - LOAD_OFFSET) {
{ *(.text..lock) } *(.text..lock)
}
#endif #endif
_etext = .; _etext = .;
/* Read-only data */ /*
* Read-only data
*/
NOTES :code :note /* put .notes in text and mark in PT_NOTE */ NOTES :code :note /* put .notes in text and mark in PT_NOTE */
code_continues : {} :code /* switch back to regular program... */ code_continues : {
} : code /* switch back to regular program... */
EXCEPTION_TABLE(16) EXCEPTION_TABLE(16)
/* MCA table */ /* MCA table */
. = ALIGN(16); . = ALIGN(16);
__mca_table : AT(ADDR(__mca_table) - LOAD_OFFSET) __mca_table : AT(ADDR(__mca_table) - LOAD_OFFSET) {
{
__start___mca_table = .; __start___mca_table = .;
*(__mca_table) *(__mca_table)
__stop___mca_table = .; __stop___mca_table = .;
} }
.data..patch.phys_stack_reg : AT(ADDR(.data..patch.phys_stack_reg) - LOAD_OFFSET) .data..patch.phys_stack_reg : AT(ADDR(.data..patch.phys_stack_reg) - LOAD_OFFSET) {
{
__start___phys_stack_reg_patchlist = .; __start___phys_stack_reg_patchlist = .;
*(.data..patch.phys_stack_reg) *(.data..patch.phys_stack_reg)
__end___phys_stack_reg_patchlist = .; __end___phys_stack_reg_patchlist = .;
} }
/* Global data */ /*
* Global data
*/
_data = .; _data = .;
/* Unwind info & table: */ /* Unwind info & table: */
. = ALIGN(8); . = ALIGN(8);
.IA_64.unwind_info : AT(ADDR(.IA_64.unwind_info) - LOAD_OFFSET) .IA_64.unwind_info : AT(ADDR(.IA_64.unwind_info) - LOAD_OFFSET) {
{ *(.IA_64.unwind_info*) } *(.IA_64.unwind_info*)
.IA_64.unwind : AT(ADDR(.IA_64.unwind) - LOAD_OFFSET) }
{ .IA_64.unwind : AT(ADDR(.IA_64.unwind) - LOAD_OFFSET) {
__start_unwind = .; __start_unwind = .;
*(.IA_64.unwind*) *(.IA_64.unwind*)
__end_unwind = .; __end_unwind = .;
} :code :unwind } :code :unwind
code_continues2 : {} : code code_continues2 : {
} : code
RODATA RODATA
.opd : AT(ADDR(.opd) - LOAD_OFFSET) .opd : AT(ADDR(.opd) - LOAD_OFFSET) {
{ *(.opd) } *(.opd)
}
/* Initialization code and data: */
/*
* Initialization code and data:
*/
. = ALIGN(PAGE_SIZE); . = ALIGN(PAGE_SIZE);
__init_begin = .; __init_begin = .;
INIT_TEXT_SECTION(PAGE_SIZE) INIT_TEXT_SECTION(PAGE_SIZE)
INIT_DATA_SECTION(16) INIT_DATA_SECTION(16)
.data..patch.vtop : AT(ADDR(.data..patch.vtop) - LOAD_OFFSET) .data..patch.vtop : AT(ADDR(.data..patch.vtop) - LOAD_OFFSET) {
{
__start___vtop_patchlist = .; __start___vtop_patchlist = .;
*(.data..patch.vtop) *(.data..patch.vtop)
__end___vtop_patchlist = .; __end___vtop_patchlist = .;
} }
.data..patch.rse : AT(ADDR(.data..patch.rse) - LOAD_OFFSET) .data..patch.rse : AT(ADDR(.data..patch.rse) - LOAD_OFFSET) {
{
__start___rse_patchlist = .; __start___rse_patchlist = .;
*(.data..patch.rse) *(.data..patch.rse)
__end___rse_patchlist = .; __end___rse_patchlist = .;
} }
.data..patch.mckinley_e9 : AT(ADDR(.data..patch.mckinley_e9) - LOAD_OFFSET) .data..patch.mckinley_e9 : AT(ADDR(.data..patch.mckinley_e9) - LOAD_OFFSET) {
{
__start___mckinley_e9_bundles = .; __start___mckinley_e9_bundles = .;
*(.data..patch.mckinley_e9) *(.data..patch.mckinley_e9)
__end___mckinley_e9_bundles = .; __end___mckinley_e9_bundles = .;
...@@ -133,22 +139,19 @@ SECTIONS ...@@ -133,22 +139,19 @@ SECTIONS
#if defined(CONFIG_PARAVIRT) #if defined(CONFIG_PARAVIRT)
. = ALIGN(16); . = ALIGN(16);
.paravirt_bundles : AT(ADDR(.paravirt_bundles) - LOAD_OFFSET) .paravirt_bundles : AT(ADDR(.paravirt_bundles) - LOAD_OFFSET) {
{
__start_paravirt_bundles = .; __start_paravirt_bundles = .;
*(.paravirt_bundles) *(.paravirt_bundles)
__stop_paravirt_bundles = .; __stop_paravirt_bundles = .;
} }
. = ALIGN(16); . = ALIGN(16);
.paravirt_insts : AT(ADDR(.paravirt_insts) - LOAD_OFFSET) .paravirt_insts : AT(ADDR(.paravirt_insts) - LOAD_OFFSET) {
{
__start_paravirt_insts = .; __start_paravirt_insts = .;
*(.paravirt_insts) *(.paravirt_insts)
__stop_paravirt_insts = .; __stop_paravirt_insts = .;
} }
. = ALIGN(16); . = ALIGN(16);
.paravirt_branches : AT(ADDR(.paravirt_branches) - LOAD_OFFSET) .paravirt_branches : AT(ADDR(.paravirt_branches) - LOAD_OFFSET) {
{
__start_paravirt_branches = .; __start_paravirt_branches = .;
*(.paravirt_branches) *(.paravirt_branches)
__stop_paravirt_branches = .; __stop_paravirt_branches = .;
...@@ -158,8 +161,7 @@ SECTIONS ...@@ -158,8 +161,7 @@ SECTIONS
#if defined(CONFIG_IA64_GENERIC) #if defined(CONFIG_IA64_GENERIC)
/* Machine Vector */ /* Machine Vector */
. = ALIGN(16); . = ALIGN(16);
.machvec : AT(ADDR(.machvec) - LOAD_OFFSET) .machvec : AT(ADDR(.machvec) - LOAD_OFFSET) {
{
machvec_start = .; machvec_start = .;
*(.machvec) *(.machvec)
machvec_end = .; machvec_end = .;
...@@ -175,8 +177,7 @@ SECTIONS ...@@ -175,8 +177,7 @@ SECTIONS
. = ALIGN(PAGE_SIZE); . = ALIGN(PAGE_SIZE);
__init_end = .; __init_end = .;
.data..page_aligned : AT(ADDR(.data..page_aligned) - LOAD_OFFSET) .data..page_aligned : AT(ADDR(.data..page_aligned) - LOAD_OFFSET) {
{
PAGE_ALIGNED_DATA(PAGE_SIZE) PAGE_ALIGNED_DATA(PAGE_SIZE)
. = ALIGN(PAGE_SIZE); . = ALIGN(PAGE_SIZE);
__start_gate_section = .; __start_gate_section = .;
...@@ -189,21 +190,25 @@ SECTIONS ...@@ -189,21 +190,25 @@ SECTIONS
__xen_stop_gate_section = .; __xen_stop_gate_section = .;
#endif #endif
} }
. = ALIGN(PAGE_SIZE); /* make sure the gate page doesn't expose /*
* make sure the gate page doesn't expose
* kernel data * kernel data
*/ */
. = ALIGN(PAGE_SIZE);
/* Per-cpu data: */ /* Per-cpu data: */
. = ALIGN(PERCPU_PAGE_SIZE); . = ALIGN(PERCPU_PAGE_SIZE);
PERCPU_VADDR(PERCPU_ADDR, :percpu) PERCPU_VADDR(PERCPU_ADDR, :percpu)
__phys_per_cpu_start = __per_cpu_load; __phys_per_cpu_start = __per_cpu_load;
. = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits /*
* ensure percpu data fits
* into percpu page size * into percpu page size
*/ */
. = __phys_per_cpu_start + PERCPU_PAGE_SIZE;
data : { } :data data : {
.data : AT(ADDR(.data) - LOAD_OFFSET) } :data
{ .data : AT(ADDR(.data) - LOAD_OFFSET) {
INIT_TASK_DATA(PAGE_SIZE) INIT_TASK_DATA(PAGE_SIZE)
CACHELINE_ALIGNED_DATA(SMP_CACHE_BYTES) CACHELINE_ALIGNED_DATA(SMP_CACHE_BYTES)
READ_MOSTLY_DATA(SMP_CACHE_BYTES) READ_MOSTLY_DATA(SMP_CACHE_BYTES)
...@@ -214,21 +219,32 @@ SECTIONS ...@@ -214,21 +219,32 @@ SECTIONS
} }
. = ALIGN(16); /* gp must be 16-byte aligned for exc. table */ . = ALIGN(16); /* gp must be 16-byte aligned for exc. table */
.got : AT(ADDR(.got) - LOAD_OFFSET) .got : AT(ADDR(.got) - LOAD_OFFSET) {
{ *(.got.plt) *(.got) } *(.got.plt)
*(.got)
}
__gp = ADDR(.got) + 0x200000; __gp = ADDR(.got) + 0x200000;
/* We want the small data sections together, so single-instruction offsets
can access them all, and initialized data all before uninitialized, so /*
we can shorten the on-disk segment size. */ * We want the small data sections together,
.sdata : AT(ADDR(.sdata) - LOAD_OFFSET) * so single-instruction offsets can access
{ *(.sdata) *(.sdata1) *(.srdata) } * them all, and initialized data all before
* uninitialized, so we can shorten the
* on-disk segment size.
*/
.sdata : AT(ADDR(.sdata) - LOAD_OFFSET) {
*(.sdata)
*(.sdata1)
*(.srdata)
}
_edata = .; _edata = .;
BSS_SECTION(0, 0, 0) BSS_SECTION(0, 0, 0)
_end = .; _end = .;
code : { } :code code : {
} :code
STABS_DEBUG STABS_DEBUG
DWARF_DEBUG DWARF_DEBUG
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7