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
nexedi
linux
Commits
cc3cd601
Commit
cc3cd601
authored
Feb 18, 2003
by
Richard Henderson
Browse files
Options
Browse Files
Download
Plain Diff
Merge dorothy.sfbay.redhat.com:/dorothy/rth/linux/linus-2.5
into dorothy.sfbay.redhat.com:/dorothy/rth/linux/axp-2.5
parents
6aa909be
2f3c289f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
5 deletions
+11
-5
arch/alpha/kernel/core_irongate.c
arch/alpha/kernel/core_irongate.c
+3
-2
arch/alpha/mm/numa.c
arch/alpha/mm/numa.c
+4
-3
include/asm-alpha/ide.h
include/asm-alpha/ide.h
+2
-0
include/asm-alpha/posix_types.h
include/asm-alpha/posix_types.h
+2
-0
No files found.
arch/alpha/kernel/core_irongate.c
View file @
cc3cd601
...
...
@@ -236,14 +236,15 @@ albacore_init_arch(void)
unsigned
long
size
;
size
=
initrd_end
-
initrd_start
;
free_bootmem
(
__pa
(
initrd_start
),
PAGE_ALIGN
(
size
));
free_bootmem_node
(
NODE_DATA
(
0
),
__pa
(
initrd_start
),
PAGE_ALIGN
(
size
));
if
(
!
move_initrd
(
pci_mem
))
printk
(
"irongate_init_arch: initrd too big "
"(%ldK)
\n
disabling initrd
\n
"
,
size
/
1024
);
}
#endif
reserve_bootmem
(
pci_mem
,
memtop
-
pci_mem
);
reserve_bootmem
_node
(
NODE_DATA
(
0
),
pci_mem
,
memtop
-
pci_mem
);
printk
(
"irongate_init_arch: temporarily reserving "
"region %08lx-%08lx for PCI
\n
"
,
pci_mem
,
memtop
-
1
);
}
...
...
arch/alpha/mm/numa.c
View file @
cc3cd601
...
...
@@ -279,7 +279,8 @@ setup_memory(void *kernel_end)
initrd_end
,
phys_to_virt
(
PFN_PHYS
(
max_low_pfn
)));
}
else
{
reserve_bootmem_node
(
NODE_DATA
(
KVADDR_TO_NID
(
initrd_start
)),
nid
=
NODE_DATA
(
kvaddr_to_nid
(
initrd_start
));
reserve_bootmem_node
(
nid
,
virt_to_phys
((
void
*
)
initrd_start
),
INITRD_SIZE
);
}
...
...
@@ -349,8 +350,8 @@ void __init mem_init(void)
initsize
=
(
unsigned
long
)
&
__init_end
-
(
unsigned
long
)
&
__init_begin
;
printk
(
"Memory: %luk/%luk available (%luk kernel code, %luk reserved, "
"%luk data, %luk init)
\n
"
,
nr_free_pages
()
<<
(
PAGE_SHIFT
-
10
),
"%luk data, %luk init)
\n
"
,
(
unsigned
long
)
nr_free_pages
()
<<
(
PAGE_SHIFT
-
10
),
num_physpages
<<
(
PAGE_SHIFT
-
10
),
codesize
>>
10
,
reservedpages
<<
(
PAGE_SHIFT
-
10
),
...
...
include/asm-alpha/ide.h
View file @
cc3cd601
...
...
@@ -80,6 +80,8 @@ static __inline__ void ide_init_default_hwifs(void)
#endif
}
#include <asm-generic/ide_iops.h>
#endif
/* __KERNEL__ */
#endif
/* __ASMalpha_IDE_H */
include/asm-alpha/posix_types.h
View file @
cc3cd601
...
...
@@ -28,6 +28,8 @@ typedef char * __kernel_caddr_t;
typedef
unsigned
long
__kernel_sigset_t
;
/* at least 32 bits */
typedef
unsigned
short
__kernel_uid16_t
;
typedef
unsigned
short
__kernel_gid16_t
;
typedef
int
__kernel_clockid_t
;
typedef
int
__kernel_timer_t
;
typedef
struct
{
int
val
[
2
];
...
...
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