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
2f66447a
Commit
2f66447a
authored
Jul 28, 2003
by
David Mosberger
Browse files
Options
Browse Files
Download
Plain Diff
Merge tiger.hpl.hp.com:/data1/bk/vanilla/linux-2.5
into tiger.hpl.hp.com:/data1/bk/lia64/to-linus-2.5
parents
3a2b9514
318f0763
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
arch/ia64/kernel/setup.c
arch/ia64/kernel/setup.c
+1
-2
include/asm-ia64/io.h
include/asm-ia64/io.h
+1
-1
No files found.
arch/ia64/kernel/setup.c
View file @
2f66447a
...
...
@@ -372,6 +372,7 @@ setup_arch (char **cmdline_p)
strlcpy
(
saved_command_line
,
*
cmdline_p
,
sizeof
(
saved_command_line
));
efi_init
();
find_memory
();
#ifdef CONFIG_ACPI_BOOT
/* Initialize the ACPI boot-time table parser */
...
...
@@ -385,8 +386,6 @@ setup_arch (char **cmdline_p)
# endif
#endif
/* CONFIG_APCI_BOOT */
find_memory
();
/* process SAL system table: */
ia64_sal_init
(
efi
.
sal_systab
);
...
...
include/asm-ia64/io.h
View file @
2f66447a
...
...
@@ -420,6 +420,7 @@ extern void __ia64_memset_c_io (unsigned long, unsigned long, long);
* SPECweb-like workloads on zx1-based machines. Thus, for now we favor I/O MMU bypassing
* over BIO-level virtual merging.
*/
extern
unsigned
long
ia64_max_iommu_merge_mask
;
#if 1
#define BIO_VMERGE_BOUNDARY 0
#else
...
...
@@ -433,7 +434,6 @@ extern void __ia64_memset_c_io (unsigned long, unsigned long, long);
*
* which is precisely what we want.
*/
extern
unsigned
long
ia64_max_iommu_merge_mask
;
#define BIO_VMERGE_BOUNDARY (ia64_max_iommu_merge_mask + 1)
#endif
...
...
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