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
03e9e86c
Commit
03e9e86c
authored
Sep 08, 2004
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
http://lia64.bkbits.net/linux-ia64-release-2.6.9
into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents
20a579c1
8db4d451
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
26 additions
and
17 deletions
+26
-17
arch/ia64/hp/sim/simserial.c
arch/ia64/hp/sim/simserial.c
+1
-5
arch/ia64/kernel/acpi.c
arch/ia64/kernel/acpi.c
+1
-0
arch/ia64/kernel/irq.c
arch/ia64/kernel/irq.c
+2
-0
arch/ia64/kernel/unwind.c
arch/ia64/kernel/unwind.c
+7
-8
arch/ia64/mm/discontig.c
arch/ia64/mm/discontig.c
+14
-3
arch/ia64/pci/pci.c
arch/ia64/pci/pci.c
+1
-1
No files found.
arch/ia64/hp/sim/simserial.c
View file @
03e9e86c
...
...
@@ -50,10 +50,6 @@
#define _INLINE_ inline
#endif
#ifndef MIN
#define MIN(a,b) ((a) < (b) ? (a) : (b))
#endif
#define IRQ_T(info) ((info->flags & ASYNC_SHARE_IRQ) ? SA_SHIRQ : SA_INTERRUPT)
#define SSC_GETCHAR 21
...
...
@@ -275,7 +271,7 @@ static _INLINE_ void transmit_chars(struct async_struct *info, int *intr_done)
* Then from the beginning of the buffer until necessary
*/
count
=
MIN
(
CIRC_CNT
(
info
->
xmit
.
head
,
info
->
xmit
.
tail
,
SERIAL_XMIT_SIZE
),
count
=
min
(
CIRC_CNT
(
info
->
xmit
.
head
,
info
->
xmit
.
tail
,
SERIAL_XMIT_SIZE
),
SERIAL_XMIT_SIZE
-
info
->
xmit
.
tail
);
console
->
write
(
console
,
info
->
xmit
.
buf
+
info
->
xmit
.
tail
,
count
);
...
...
arch/ia64/kernel/acpi.c
View file @
03e9e86c
...
...
@@ -61,6 +61,7 @@
void
(
*
pm_idle
)
(
void
);
EXPORT_SYMBOL
(
pm_idle
);
void
(
*
pm_power_off
)
(
void
);
EXPORT_SYMBOL
(
pm_power_off
);
unsigned
char
acpi_kbd_controller_present
=
1
;
unsigned
char
acpi_legacy_devices
;
...
...
arch/ia64/kernel/irq.c
View file @
03e9e86c
...
...
@@ -84,11 +84,13 @@ irq_desc_t _irq_desc[NR_IRQS] __cacheline_aligned = {
}
};
#ifdef CONFIG_SMP
/*
* This is updated when the user sets irq affinity via /proc
*/
cpumask_t
__cacheline_aligned
pending_irq_cpumask
[
NR_IRQS
];
static
unsigned
long
pending_irq_redir
[
BITS_TO_LONGS
(
NR_IRQS
)];
#endif
#ifdef CONFIG_IA64_GENERIC
irq_desc_t
*
__ia64_irq_desc
(
unsigned
int
irq
)
...
...
arch/ia64/kernel/unwind.c
View file @
03e9e86c
...
...
@@ -47,7 +47,6 @@
#include "entry.h"
#include "unwind_i.h"
#define MIN(a,b) ((a) < (b) ? (a) : (b))
#define p5 5
#define UNW_LOG_CACHE_SIZE 7
/* each unw_script is ~256 bytes in size */
...
...
@@ -963,13 +962,13 @@ static inline void
desc_mem_stack_f
(
unw_word
t
,
unw_word
size
,
struct
unw_state_record
*
sr
)
{
set_reg
(
sr
->
curr
.
reg
+
UNW_REG_PSP
,
UNW_WHERE_NONE
,
sr
->
region_start
+
MIN
((
int
)
t
,
sr
->
region_len
-
1
),
16
*
size
);
sr
->
region_start
+
min_t
(
int
,
t
,
sr
->
region_len
-
1
),
16
*
size
);
}
static
inline
void
desc_mem_stack_v
(
unw_word
t
,
struct
unw_state_record
*
sr
)
{
sr
->
curr
.
reg
[
UNW_REG_PSP
].
when
=
sr
->
region_start
+
MIN
((
int
)
t
,
sr
->
region_len
-
1
);
sr
->
curr
.
reg
[
UNW_REG_PSP
].
when
=
sr
->
region_start
+
min_t
(
int
,
t
,
sr
->
region_len
-
1
);
}
static
inline
void
...
...
@@ -1005,7 +1004,7 @@ desc_reg_when (unsigned char regnum, unw_word t, struct unw_state_record *sr)
if
(
reg
->
where
==
UNW_WHERE_NONE
)
reg
->
where
=
UNW_WHERE_GR_SAVE
;
reg
->
when
=
sr
->
region_start
+
MIN
((
int
)
t
,
sr
->
region_len
-
1
);
reg
->
when
=
sr
->
region_start
+
min_t
(
int
,
t
,
sr
->
region_len
-
1
);
}
static
inline
void
...
...
@@ -1073,7 +1072,7 @@ desc_label_state (unw_word label, struct unw_state_record *sr)
static
inline
int
desc_is_active
(
unsigned
char
qp
,
unw_word
t
,
struct
unw_state_record
*
sr
)
{
if
(
sr
->
when_target
<=
sr
->
region_start
+
MIN
((
int
)
t
,
sr
->
region_len
-
1
))
if
(
sr
->
when_target
<=
sr
->
region_start
+
min_t
(
int
,
t
,
sr
->
region_len
-
1
))
return
0
;
if
(
qp
>
0
)
{
if
((
sr
->
pr_val
&
(
1UL
<<
qp
))
==
0
)
...
...
@@ -1114,7 +1113,7 @@ desc_spill_reg_p (unsigned char qp, unw_word t, unsigned char abreg, unsigned ch
r
=
sr
->
curr
.
reg
+
decode_abreg
(
abreg
,
0
);
r
->
where
=
where
;
r
->
when
=
sr
->
region_start
+
MIN
((
int
)
t
,
sr
->
region_len
-
1
);
r
->
when
=
sr
->
region_start
+
min_t
(
int
,
t
,
sr
->
region_len
-
1
);
r
->
val
=
(
ytreg
&
0x7f
);
}
...
...
@@ -1129,7 +1128,7 @@ desc_spill_psprel_p (unsigned char qp, unw_word t, unsigned char abreg, unw_word
r
=
sr
->
curr
.
reg
+
decode_abreg
(
abreg
,
1
);
r
->
where
=
UNW_WHERE_PSPREL
;
r
->
when
=
sr
->
region_start
+
MIN
((
int
)
t
,
sr
->
region_len
-
1
);
r
->
when
=
sr
->
region_start
+
min_t
(
int
,
t
,
sr
->
region_len
-
1
);
r
->
val
=
0x10
-
4
*
pspoff
;
}
...
...
@@ -1144,7 +1143,7 @@ desc_spill_sprel_p (unsigned char qp, unw_word t, unsigned char abreg, unw_word
r
=
sr
->
curr
.
reg
+
decode_abreg
(
abreg
,
1
);
r
->
where
=
UNW_WHERE_SPREL
;
r
->
when
=
sr
->
region_start
+
MIN
((
int
)
t
,
sr
->
region_len
-
1
);
r
->
when
=
sr
->
region_start
+
min_t
(
int
,
t
,
sr
->
region_len
-
1
);
r
->
val
=
4
*
spoff
;
}
...
...
arch/ia64/mm/discontig.c
View file @
03e9e86c
...
...
@@ -492,14 +492,17 @@ void *per_cpu_init(void)
*/
void
show_mem
(
void
)
{
int
i
,
reserved
=
0
;
int
shared
=
0
,
cached
=
0
;
int
i
,
total_reserved
=
0
;
int
total_shared
=
0
,
total_cached
=
0
;
unsigned
long
total_present
=
0
;
pg_data_t
*
pgdat
;
printk
(
"Mem-info:
\n
"
);
show_free_areas
();
printk
(
"Free swap: %6ldkB
\n
"
,
nr_swap_pages
<<
(
PAGE_SHIFT
-
10
));
for_each_pgdat
(
pgdat
)
{
unsigned
long
present
=
pgdat
->
node_present_pages
;
int
shared
=
0
,
cached
=
0
,
reserved
=
0
;
printk
(
"Node ID: %d
\n
"
,
pgdat
->
node_id
);
for
(
i
=
0
;
i
<
pgdat
->
node_spanned_pages
;
i
++
)
{
if
(
!
ia64_pfn_valid
(
pgdat
->
node_start_pfn
+
i
))
...
...
@@ -511,11 +514,19 @@ void show_mem(void)
else
if
(
page_count
(
pgdat
->
node_mem_map
+
i
))
shared
+=
page_count
(
pgdat
->
node_mem_map
+
i
)
-
1
;
}
printk
(
"
\t
%ld pages of RAM
\n
"
,
pgdat
->
node_present_pages
);
total_present
+=
present
;
total_reserved
+=
reserved
;
total_cached
+=
cached
;
total_shared
+=
shared
;
printk
(
"
\t
%ld pages of RAM
\n
"
,
present
);
printk
(
"
\t
%d reserved pages
\n
"
,
reserved
);
printk
(
"
\t
%d pages shared
\n
"
,
shared
);
printk
(
"
\t
%d pages swap cached
\n
"
,
cached
);
}
printk
(
"%ld pages of RAM
\n
"
,
total_present
);
printk
(
"%d reserved pages
\n
"
,
total_reserved
);
printk
(
"%d pages shared
\n
"
,
total_shared
);
printk
(
"%d pages swap cached
\n
"
,
total_cached
);
printk
(
"Total of %ld pages in page table cache
\n
"
,
pgtable_cache_size
);
printk
(
"%d free buffer pages
\n
"
,
nr_free_buffer_pages
());
}
...
...
arch/ia64/pci/pci.c
View file @
03e9e86c
...
...
@@ -330,7 +330,7 @@ pcibios_fixup_device_resources (struct pci_dev *dev, struct pci_bus *bus)
struct
pci_window
*
window
;
int
i
,
j
;
int
limit
=
(
dev
->
hdr_type
==
PCI_HEADER_TYPE_NORMAL
)
?
\
PCI_
ROM_RESOURCE
:
PCI_NUM_RESOURCES
;
PCI_
BRIDGE_RESOURCES
:
PCI_NUM_RESOURCES
;
for
(
i
=
0
;
i
<
limit
;
i
++
)
{
if
(
!
dev
->
resource
[
i
].
start
)
...
...
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