Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
b4d53d4b
Commit
b4d53d4b
authored
Feb 14, 2004
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
http://lia64.bkbits.net/to-linus-2.5
into home.osdl.org:/home/torvalds/v2.5/linux
parents
fbf464a2
9fbaaac0
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
25 additions
and
47 deletions
+25
-47
arch/ia64/kernel/acpi.c
arch/ia64/kernel/acpi.c
+1
-1
arch/ia64/kernel/irq.c
arch/ia64/kernel/irq.c
+0
-2
arch/ia64/kernel/mca.c
arch/ia64/kernel/mca.c
+5
-32
arch/ia64/kernel/smp.c
arch/ia64/kernel/smp.c
+0
-4
arch/ia64/kernel/smpboot.c
arch/ia64/kernel/smpboot.c
+0
-5
arch/ia64/scripts/toolchain-flags
arch/ia64/scripts/toolchain-flags
+15
-0
arch/ia64/sn/kernel/setup.c
arch/ia64/sn/kernel/setup.c
+2
-0
arch/ia64/sn/kernel/sn2/cache.c
arch/ia64/sn/kernel/sn2/cache.c
+1
-1
drivers/char/sn_serial.c
drivers/char/sn_serial.c
+1
-1
include/asm-ia64/mca.h
include/asm-ia64/mca.h
+0
-1
No files found.
arch/ia64/kernel/acpi.c
View file @
b4d53d4b
...
...
@@ -589,7 +589,7 @@ acpi_boot_init (void)
smp_boot_data
.
cpu_count
=
available_cpus
;
smp_build_cpu_map
();
# ifdef CONFIG_NUMA
# ifdef CONFIG_
ACPI_
NUMA
if
(
srat_num_cpus
==
0
)
{
int
cpu
,
i
=
1
;
for
(
cpu
=
0
;
cpu
<
smp_boot_data
.
cpu_count
;
cpu
++
)
...
...
arch/ia64/kernel/irq.c
View file @
b4d53d4b
...
...
@@ -465,8 +465,6 @@ unsigned int do_IRQ(unsigned long irq, struct pt_regs *regs)
desc
->
handler
->
ack
(
irq
);
action_ret
=
handle_IRQ_event
(
irq
,
regs
,
desc
->
action
);
desc
->
handler
->
end
(
irq
);
if
(
!
noirqdebug
)
note_interrupt
(
irq
,
desc
,
action_ret
);
}
else
{
spin_lock
(
&
desc
->
lock
);
desc
->
handler
->
ack
(
irq
);
...
...
arch/ia64/kernel/mca.c
View file @
b4d53d4b
...
...
@@ -239,10 +239,9 @@ ia64_log_get(int sal_info_type, u8 **buffer, int irq_safe)
* and wakes up any processes waiting for error records.
*
* Inputs : sal_info_type (Type of error record MCA/CMC/CPE/INIT)
* called_from_init (1 for boot processing)
*/
static
void
ia64_mca_log_sal_error_record
(
int
sal_info_type
,
int
called_from_init
)
ia64_mca_log_sal_error_record
(
int
sal_info_type
)
{
u8
*
buffer
;
u64
size
;
...
...
@@ -255,7 +254,7 @@ ia64_mca_log_sal_error_record(int sal_info_type, int called_from_init)
salinfo_log_wakeup
(
sal_info_type
,
buffer
,
size
,
irq_safe
);
if
(
irq_safe
||
called_from_init
)
if
(
irq_safe
)
printk
(
KERN_INFO
"CPU %d: SAL log contains %s error record
\n
"
,
smp_processor_id
(),
sal_info_type
<
ARRAY_SIZE
(
rec_name
)
?
rec_name
[
sal_info_type
]
:
"UNKNOWN"
);
...
...
@@ -280,7 +279,7 @@ ia64_mca_cpe_int_handler (int cpe_irq, void *arg, struct pt_regs *ptregs)
local_irq_enable
();
/* Get the CMC error record and log it */
ia64_mca_log_sal_error_record
(
SAL_INFO_TYPE_CPE
,
0
);
ia64_mca_log_sal_error_record
(
SAL_INFO_TYPE_CPE
);
return
IRQ_HANDLED
;
}
...
...
@@ -469,32 +468,6 @@ init_handler_platform (pal_min_state_area_t *ms,
while
(
1
);
/* hang city if no debugger */
}
/*
* ia64_mca_check_errors
*
* External entry to check for error records which may have been posted by SAL
* for a prior failure which resulted in a machine shutdown before an the
* error could be logged. This function must be called after the filesystem
* is initialized.
*
* Inputs : None
*
* Outputs : None
*/
int
ia64_mca_check_errors
(
void
)
{
/*
* If there is an MCA error record pending, get it and log it.
*/
printk
(
KERN_INFO
"CPU %d: checking for saved MCA error records
\n
"
,
smp_processor_id
());
ia64_mca_log_sal_error_record
(
SAL_INFO_TYPE_MCA
,
1
);
return
0
;
}
device_initcall
(
ia64_mca_check_errors
);
#ifdef CONFIG_ACPI
/*
* ia64_mca_register_cpev
...
...
@@ -831,7 +804,7 @@ ia64_mca_ucmc_handler(void)
int
recover
=
psp
->
tc
&&
!
(
psp
->
cc
||
psp
->
bc
||
psp
->
rc
||
psp
->
uc
);
/* Get the MCA error record and log it */
ia64_mca_log_sal_error_record
(
SAL_INFO_TYPE_MCA
,
0
);
ia64_mca_log_sal_error_record
(
SAL_INFO_TYPE_MCA
);
/*
* Wakeup all the processors which are spinning in the rendezvous
...
...
@@ -875,7 +848,7 @@ ia64_mca_cmc_int_handler(int cmc_irq, void *arg, struct pt_regs *ptregs)
local_irq_enable
();
/* Get the CMC error record and log it */
ia64_mca_log_sal_error_record
(
SAL_INFO_TYPE_CMC
,
0
);
ia64_mca_log_sal_error_record
(
SAL_INFO_TYPE_CMC
);
spin_lock
(
&
cmc_history_lock
);
if
(
!
cmc_polling_enabled
)
{
...
...
arch/ia64/kernel/smp.c
View file @
b4d53d4b
...
...
@@ -18,10 +18,6 @@
* 10/13/00 Goutham Rao <goutham.rao@intel.com> Updated smp_call_function and
* smp_call_function_single to resend IPI on timeouts
*/
#define __KERNEL_SYSCALLS__
#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/sched.h>
...
...
arch/ia64/kernel/smpboot.c
View file @
b4d53d4b
...
...
@@ -10,10 +10,6 @@
* smp_boot_cpus()/smp_commence() is replaced by
* smp_prepare_cpus()/__cpu_up()/smp_cpus_done().
*/
#define __KERNEL_SYSCALLS__
#include <linux/config.h>
#include <linux/module.h>
...
...
@@ -306,7 +302,6 @@ smp_callin (void)
#ifdef CONFIG_IA64_MCA
ia64_mca_cmc_vector_setup
();
/* Setup vector on AP & enable */
ia64_mca_check_errors
();
/* For post-failure MCA error logging */
#endif
#ifdef CONFIG_PERFMON
...
...
arch/ia64/scripts/toolchain-flags
View file @
b4d53d4b
...
...
@@ -5,9 +5,14 @@
CPPFLAGS
=
""
CC
=
$1
OBJDUMP
=
$2
READELF
=
$3
dir
=
$(
dirname
$0
)
tmp
=
${
TMPDIR
:-
/tmp
}
out
=
$tmp
/out
$$
# Check whether cross-segment segment-relative relocs work fine. We need
# that for building the gate DSO:
$CC
-nostdlib
-static
-Wl
,-T
$dir
/check-segrel.lds
$dir
/check-segrel.S
-o
$out
res
=
$(
$OBJDUMP
--full
--section
.rodata
$out
| fgrep 000 |
cut
-f3
-d
' '
)
rm
-f
$out
...
...
@@ -20,6 +25,16 @@ warning: your linker cannot handle cross-segment segment-relative relocations.
EOF
fi
# Check whether .align inside a function works as expected.
$CC
-c
$dir
/check-text-align.S
-o
$out
$READELF
-u
$out
| fgrep
-q
'prologue(rlen=12)'
res
=
$?
rm
-f
$out
if
[
$res
-eq
0
]
;
then
CPPFLAGS
=
"
$CPPFLAGS
-DHAVE_WORKING_TEXT_ALIGN"
fi
if
!
$CC
-c
$dir
/check-model.c
-o
$out
2>&1 |
grep
__model__ |
grep
-q
attrib
then
CPPFLAGS
=
"
$CPPFLAGS
-DHAVE_MODEL_SMALL_ATTRIBUTE"
...
...
arch/ia64/sn/kernel/setup.c
View file @
b4d53d4b
...
...
@@ -71,6 +71,8 @@ u64 sn_partition_serial_number;
short
physical_node_map
[
MAX_PHYSNODE_ID
];
EXPORT_SYMBOL
(
physical_node_map
);
int
numionodes
;
/*
* This is the address of the RRegs in the HSpace of the global
...
...
arch/ia64/sn/kernel/sn2/cache.c
View file @
b4d53d4b
...
...
@@ -6,7 +6,7 @@
* Copyright (C) 2001-2003 Silicon Graphics, Inc. All rights reserved.
*
*/
#include <linux/module.h>
#include <asm/pgalloc.h>
/**
...
...
drivers/char/sn_serial.c
View file @
b4d53d4b
...
...
@@ -772,7 +772,7 @@ sn_sal_read_proc(char *page, char **start, off_t off, int count,
int
len
=
0
;
off_t
begin
=
0
;
len
+=
sprintf
(
page
,
"sn_serial: nasid:%d irq:%d tx:%d rx:%d
\n
"
,
len
+=
sprintf
(
page
,
"sn_serial: nasid:%
l
d irq:%d tx:%d rx:%d
\n
"
,
ia64_sn_get_console_nasid
(),
sn_sal_irq
,
sn_total_tx_count
,
sn_total_rx_count
);
*
eof
=
1
;
...
...
include/asm-ia64/mca.h
View file @
b4d53d4b
...
...
@@ -114,7 +114,6 @@ extern void ia64_mca_ucmc_handler(void);
extern
void
ia64_monarch_init_handler
(
void
);
extern
void
ia64_slave_init_handler
(
void
);
extern
void
ia64_mca_cmc_vector_setup
(
void
);
extern
int
ia64_mca_check_errors
(
void
);
#endif
/* !__ASSEMBLY__ */
#endif
/* _ASM_IA64_MCA_H */
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment