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
8b93924a
Commit
8b93924a
authored
Jan 09, 2003
by
Paul Mackerras
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://68.0.152.218/linux-2.5-misc
into samba.org:/home/paulus/kernel/for-linus-ppc
parents
be5828b4
c06078f7
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
135 additions
and
93 deletions
+135
-93
arch/ppc/Kconfig
arch/ppc/Kconfig
+6
-41
arch/ppc/boot/prep/misc.c
arch/ppc/boot/prep/misc.c
+25
-3
arch/ppc/boot/simple/misc-embedded.c
arch/ppc/boot/simple/misc-embedded.c
+24
-3
arch/ppc/boot/simple/misc-spruce.c
arch/ppc/boot/simple/misc-spruce.c
+25
-4
arch/ppc/boot/simple/misc.c
arch/ppc/boot/simple/misc.c
+25
-6
arch/ppc/kernel/time.c
arch/ppc/kernel/time.c
+9
-11
arch/ppc/platforms/prep_setup.c
arch/ppc/platforms/prep_setup.c
+14
-1
include/asm-ppc/bitops.h
include/asm-ppc/bitops.h
+0
-8
include/asm-ppc/cache.h
include/asm-ppc/cache.h
+1
-2
include/asm-ppc/io.h
include/asm-ppc/io.h
+0
-3
include/asm-ppc/nvram.h
include/asm-ppc/nvram.h
+0
-4
include/asm-ppc/page.h
include/asm-ppc/page.h
+1
-1
include/asm-ppc/param.h
include/asm-ppc/param.h
+1
-1
include/asm-ppc/signal.h
include/asm-ppc/signal.h
+2
-3
include/asm-ppc/socket.h
include/asm-ppc/socket.h
+1
-1
include/asm-ppc/termios.h
include/asm-ppc/termios.h
+1
-1
No files found.
arch/ppc/Kconfig
View file @
8b93924a
...
...
@@ -1060,13 +1060,7 @@ config HIGHMEM_START_BOOL
Say N here unless you know what you are doing.
config HIGHMEM_START
hex "Virtual start address of high memory pool"
depends on HIGHMEM_START_BOOL
default "0xfe000000"
config HIGHMEM_START
hex
depends on !HIGHMEM_START_BOOL
hex "Virtual start address of high memory pool" if HIGHMEM_START_BOOL
default "0xfe000000"
config LOWMEM_SIZE_BOOL
...
...
@@ -1082,13 +1076,7 @@ config LOWMEM_SIZE_BOOL
Say N here unless you know what you are doing.
config LOWMEM_SIZE
hex "Maximum low memory size (in bytes)"
depends on LOWMEM_SIZE_BOOL
default "0x20000000"
config LOWMEM_SIZE
hex
depends on !LOWMEM_SIZE_BOOL
hex "Maximum low memory size (in bytes)" if LOWMEM_SIZE_BOOL
default "0x20000000"
config KERNEL_START_BOOL
...
...
@@ -1103,13 +1091,7 @@ config KERNEL_START_BOOL
Say N here unless you know what you are doing.
config KERNEL_START
hex "Virtual address of kernel base"
depends on KERNEL_START_BOOL
default "0xc0000000"
config KERNEL_START
hex
depends on !KERNEL_START_BOOL
hex "Virtual address of kernel base" if KERNEL_START_BOOL
default "0xc0000000"
config TASK_SIZE_BOOL
...
...
@@ -1123,13 +1105,7 @@ config TASK_SIZE_BOOL
Say N here unless you know what you are doing.
config TASK_SIZE
hex "Size of user task space"
depends on TASK_SIZE_BOOL
default "0x80000000"
config TASK_SIZE
hex
depends on !TASK_SIZE_BOOL
hex "Size of user task space" if TASK_SIZE_BOOL
default "0x80000000"
config BOOT_LOAD_BOOL
...
...
@@ -1143,19 +1119,8 @@ config BOOT_LOAD_BOOL
Say N here unless you know what you are doing.
config BOOT_LOAD
hex "Link/load address for booting"
depends on BOOT_LOAD_BOOL
default "0x00400000"
# If we don't have a custom load, we define one here depending.
config BOOT_LOAD
hex
depends on !BOOT_LOAD_BOOL && (40x || 8xx || 8260)
default "0x00400000"
config BOOT_LOAD
hex
depends on !BOOT_LOAD_BOOL
hex "Link/load address for booting" if BOOT_LOAD_BOOL
default "0x00400000" if 40x || 8xx || 8260
default "0x00800000"
config PIN_TLB
...
...
arch/ppc/boot/prep/misc.c
View file @
8b93924a
...
...
@@ -316,9 +316,31 @@ decompress_kernel(unsigned long load_addr, int num_words, unsigned long cksum,
{
struct
bi_record
*
rec
;
rec
=
(
struct
bi_record
*
)
_ALIGN
((
unsigned
long
)(
zimage_size
)
+
unsigned
long
initrd_loc
;
unsigned
long
rec_loc
=
_ALIGN
((
unsigned
long
)(
zimage_size
)
+
(
1
<<
20
)
-
1
,
(
1
<<
20
));
rec
=
(
struct
bi_record
*
)
rec_loc
;
/* We need to make sure that the initrd and bi_recs do not
* overlap. */
if
(
initrd_size
)
{
initrd_loc
=
(
unsigned
long
)(
&
__ramdisk_begin
);
/* If the bi_recs are in the middle of the current
* initrd, move the initrd to the next MB
* boundary. */
if
((
rec_loc
>
initrd_loc
)
&&
((
initrd_loc
+
initrd_size
)
>
rec_loc
))
{
initrd_loc
=
_ALIGN
((
unsigned
long
)(
zimage_size
)
+
(
2
<<
20
)
-
1
,
(
2
<<
20
));
memmove
((
void
*
)
initrd_loc
,
&
__ramdisk_begin
,
initrd_size
);
puts
(
"initrd moved: "
);
puthex
(
initrd_loc
);
puts
(
" "
);
puthex
(
initrd_loc
+
initrd_size
);
puts
(
"
\n
"
);
}
}
rec
->
tag
=
BI_FIRST
;
rec
->
size
=
sizeof
(
struct
bi_record
);
...
...
@@ -348,7 +370,7 @@ decompress_kernel(unsigned long load_addr, int num_words, unsigned long cksum,
if
(
initrd_size
)
{
rec
->
tag
=
BI_INITRD
;
rec
->
data
[
0
]
=
(
unsigned
long
)(
&
__ramdisk_begin
)
;
rec
->
data
[
0
]
=
initrd_loc
;
rec
->
data
[
1
]
=
initrd_size
;
rec
->
size
=
sizeof
(
struct
bi_record
)
+
2
*
sizeof
(
unsigned
long
);
...
...
arch/ppc/boot/simple/misc-embedded.c
View file @
8b93924a
...
...
@@ -209,9 +209,30 @@ decompress_kernel(unsigned long load_addr, int num_words, unsigned long cksum, b
puts
(
"done.
\n
"
);
{
struct
bi_record
*
rec
;
unsigned
long
initrd_loc
;
unsigned
long
rec_loc
=
_ALIGN
((
unsigned
long
)(
zimage_size
)
+
(
1
<<
20
)
-
1
,
(
1
<<
20
));
rec
=
(
struct
bi_record
*
)
rec_loc
;
rec
=
(
struct
bi_record
*
)
_ALIGN
((
unsigned
long
)
zimage_size
+
(
1
<<
20
)
-
1
,(
1
<<
20
));
/* We need to make sure that the initrd and bi_recs do not
* overlap. */
if
(
initrd_size
)
{
initrd_loc
=
(
unsigned
long
)(
&
__ramdisk_begin
);
/* If the bi_recs are in the middle of the current
* initrd, move the initrd to the next MB
* boundary. */
if
((
rec_loc
>
initrd_loc
)
&&
((
initrd_loc
+
initrd_size
)
>
rec_loc
))
{
initrd_loc
=
_ALIGN
((
unsigned
long
)(
zimage_size
)
+
(
2
<<
20
)
-
1
,
(
2
<<
20
));
memmove
((
void
*
)
initrd_loc
,
&
__ramdisk_begin
,
initrd_size
);
puts
(
"initrd moved: "
);
puthex
(
initrd_loc
);
puts
(
" "
);
puthex
(
initrd_loc
+
initrd_size
);
puts
(
"
\n
"
);
}
}
rec
->
tag
=
BI_FIRST
;
rec
->
size
=
sizeof
(
struct
bi_record
);
...
...
@@ -224,7 +245,7 @@ decompress_kernel(unsigned long load_addr, int num_words, unsigned long cksum, b
if
(
initrd_size
)
{
rec
->
tag
=
BI_INITRD
;
rec
->
data
[
0
]
=
(
unsigned
long
)(
&
__ramdisk_begin
)
;
rec
->
data
[
0
]
=
initrd_loc
;
rec
->
data
[
1
]
=
initrd_size
;
rec
->
size
=
sizeof
(
struct
bi_record
)
+
2
*
sizeof
(
unsigned
long
);
...
...
arch/ppc/boot/simple/misc-spruce.c
View file @
8b93924a
...
...
@@ -396,9 +396,30 @@ decompress_kernel(unsigned long load_addr, int num_words, unsigned long cksum)
{
struct
bi_record
*
rec
;
rec
=
(
struct
bi_record
*
)
_ALIGN
((
ulong
)
zimage_size
+
(
1
<<
20
)
-
1
,(
1
<<
20
));
unsigned
long
initrd_loc
;
unsigned
long
rec_loc
=
_ALIGN
((
unsigned
long
)(
zimage_size
)
+
(
1
<<
20
)
-
1
,
(
1
<<
20
));
rec
=
(
struct
bi_record
*
)
rec_loc
;
/* We need to make sure that the initrd and bi_recs do not
* overlap. */
if
(
initrd_size
)
{
initrd_loc
=
(
unsigned
long
)(
&
__ramdisk_begin
);
/* If the bi_recs are in the middle of the current
* initrd, move the initrd to the next MB
* boundary. */
if
((
rec_loc
>
initrd_loc
)
&&
((
initrd_loc
+
initrd_size
)
>
rec_loc
))
{
initrd_loc
=
_ALIGN
((
unsigned
long
)(
zimage_size
)
+
(
2
<<
20
)
-
1
,
(
2
<<
20
));
memmove
((
void
*
)
initrd_loc
,
&
__ramdisk_begin
,
initrd_size
);
puts
(
"initrd moved: "
);
puthex
(
initrd_loc
);
puts
(
" "
);
puthex
(
initrd_loc
+
initrd_size
);
puts
(
"
\n
"
);
}
}
rec
->
tag
=
BI_FIRST
;
rec
->
size
=
sizeof
(
struct
bi_record
);
...
...
@@ -421,7 +442,7 @@ decompress_kernel(unsigned long load_addr, int num_words, unsigned long cksum)
if
(
initrd_size
)
{
rec
->
tag
=
BI_INITRD
;
rec
->
data
[
0
]
=
(
unsigned
long
)(
&
__ramdisk_begin
)
;
rec
->
data
[
0
]
=
initrd_loc
;
rec
->
data
[
1
]
=
initrd_size
;
rec
->
size
=
sizeof
(
struct
bi_record
)
+
2
*
sizeof
(
unsigned
long
);
...
...
arch/ppc/boot/simple/misc.c
View file @
8b93924a
...
...
@@ -76,8 +76,8 @@ decompress_kernel(unsigned long load_addr, int num_words, unsigned long cksum)
{
int
timer
=
0
;
char
*
cp
,
ch
;
struct
bi_record
*
rec
,
*
birecs
;
unsigned
long
TotalMemory
=
0
;
struct
bi_record
*
rec
;
unsigned
long
TotalMemory
=
0
,
rec_loc
,
initrd_loc
;
serial_fixups
();
com_port
=
serial_init
(
0
,
NULL
);
...
...
@@ -197,10 +197,29 @@ decompress_kernel(unsigned long load_addr, int num_words, unsigned long cksum)
/*
* Create bi_recs for cmd_line and initrds
*/
rec
=
(
struct
bi_record
*
)
_ALIGN
((
unsigned
long
)(
zimage_size
)
+
rec
_loc
=
_ALIGN
((
unsigned
long
)(
zimage_size
)
+
(
1
<<
20
)
-
1
,
(
1
<<
20
));
birecs
=
re
c
;
rec
=
(
struct
bi_record
*
)
rec_lo
c
;
/* We need to make sure that the initrd and bi_recs do not
* overlap. */
if
(
initrd_size
)
{
initrd_loc
=
(
unsigned
long
)(
&
__ramdisk_begin
);
/* If the bi_recs are in the middle of the current
* initrd, move the initrd to the next MB
* boundary. */
if
((
rec_loc
>
initrd_loc
)
&&
((
initrd_loc
+
initrd_size
)
>
rec_loc
))
{
initrd_loc
=
_ALIGN
((
unsigned
long
)(
zimage_size
)
+
(
2
<<
20
)
-
1
,
(
2
<<
20
));
memmove
((
void
*
)
initrd_loc
,
&
__ramdisk_begin
,
initrd_size
);
puts
(
"initrd moved: "
);
puthex
(
initrd_loc
);
puts
(
" "
);
puthex
(
initrd_loc
+
initrd_size
);
puts
(
"
\n
"
);
}
}
rec
->
tag
=
BI_FIRST
;
rec
->
size
=
sizeof
(
struct
bi_record
);
rec
=
(
struct
bi_record
*
)((
unsigned
long
)
rec
+
rec
->
size
);
...
...
@@ -219,7 +238,7 @@ decompress_kernel(unsigned long load_addr, int num_words, unsigned long cksum)
if
(
initrd_size
)
{
rec
->
tag
=
BI_INITRD
;
rec
->
data
[
0
]
=
(
unsigned
long
)(
&
__ramdisk_begin
)
;
rec
->
data
[
0
]
=
initrd_loc
;
rec
->
data
[
1
]
=
initrd_size
;
rec
->
size
=
sizeof
(
struct
bi_record
)
+
2
*
sizeof
(
unsigned
long
);
...
...
@@ -233,5 +252,5 @@ decompress_kernel(unsigned long load_addr, int num_words, unsigned long cksum)
puts
(
"Now booting the kernel
\n
"
);
serial_close
(
com_port
);
return
birecs
;
return
(
struct
bi_record
*
)
rec_loc
;
}
arch/ppc/kernel/time.c
View file @
8b93924a
...
...
@@ -286,13 +286,11 @@ void do_settimeofday(struct timeval *tv)
write_unlock_irqrestore
(
&
xtime_lock
,
flags
);
}
/* This function is only called on the boot processor */
void
__init
time_init
(
void
)
{
time_t
sec
,
old_sec
;
unsigned
old_stamp
,
stamp
,
elapsed
;
/* This function is only called on the boot processor */
unsigned
long
flags
;
if
(
ppc_md
.
time_init
!=
NULL
)
time_offset
=
ppc_md
.
time_init
();
...
...
@@ -309,31 +307,31 @@ void __init time_init(void)
/* Now that the decrementer is calibrated, it can be used in case the
* clock is stuck, but the fact that we have to handle the 601
* makes things more complex. Repeatedly read the RTC until the
* next second boundary to try to achieve some precision...
* next second boundary to try to achieve some precision. If there
* is no RTC, we still need to set tb_last_stamp and
* last_jiffy_stamp(cpu 0) to the current stamp.
*/
stamp
=
get_native_tbl
();
if
(
ppc_md
.
get_rtc_time
)
{
stamp
=
get_native_tbl
();
sec
=
ppc_md
.
get_rtc_time
();
elapsed
=
0
;
do
{
old_stamp
=
stamp
;
old_sec
=
sec
;
stamp
=
get_native_tbl
();
if
(
__USE_RTC
()
&&
stamp
<
old_stamp
)
old_stamp
-=
1000000000
;
if
(
__USE_RTC
()
&&
stamp
<
old_stamp
)
old_stamp
-=
1000000000
;
elapsed
+=
stamp
-
old_stamp
;
sec
=
ppc_md
.
get_rtc_time
();
}
while
(
sec
==
old_sec
&&
elapsed
<
2
*
HZ
*
tb_ticks_per_jiffy
);
if
(
sec
==
old_sec
)
{
if
(
sec
==
old_sec
)
printk
(
"Warning: real time clock seems stuck!
\n
"
);
}
write_lock_irqsave
(
&
xtime_lock
,
flags
);
xtime
.
tv_sec
=
sec
;
last_jiffy_stamp
(
0
)
=
tb_last_stamp
=
stamp
;
xtime
.
tv_nsec
=
0
;
/* No update now, we just read the time from the RTC ! */
last_rtc_update
=
xtime
.
tv_sec
;
write_unlock_irqrestore
(
&
xtime_lock
,
flags
);
}
last_jiffy_stamp
(
0
)
=
tb_last_stamp
=
stamp
;
/* Not exact, but the timer interrupt takes care of this */
set_dec
(
tb_ticks_per_jiffy
);
...
...
arch/ppc/platforms/prep_setup.c
View file @
8b93924a
...
...
@@ -57,6 +57,7 @@
#include <asm/mpc10x.h>
#include <asm/i8259.h>
#include <asm/open_pic.h>
#include <asm/pci-bridge.h>
unsigned
char
ucSystemType
;
unsigned
char
ucBoardRev
;
...
...
@@ -991,12 +992,24 @@ static void __init
prep_init_IRQ
(
void
)
{
int
i
;
unsigned
int
pci_viddid
,
pci_did
;
if
(
OpenPIC_Addr
!=
NULL
)
openpic_init
(
NUM_8259_INTERRUPTS
);
for
(
i
=
0
;
i
<
NUM_8259_INTERRUPTS
;
i
++
)
irq_desc
[
i
].
handler
=
&
i8259_pic
;
i8259_init
(
MPC10X_MAPA_PCI_INTACK_ADDR
);
/* If we have a Raven PCI bridge or a Hawk PCI bridge / Memory
* controller, we poll (as they have a different int-ack address). */
early_read_config_dword
(
0
,
0
,
0
,
PCI_VENDOR_ID
,
&
pci_viddid
);
pci_did
=
(
pci_viddid
&
0xffff0000
)
>>
16
;
if
(((
pci_viddid
&
0xffff
)
==
PCI_VENDOR_ID_MOTOROLA
)
&&
((
pci_did
==
PCI_DEVICE_ID_MOTOROLA_RAVEN
)
||
(
pci_did
==
PCI_DEVICE_ID_MOTOROLA_HAWK
)))
i8259_init
(
0
);
else
/* PCI interrupt ack address given in section 6.1.8 of the
* PReP specification. */
i8259_init
(
MPC10X_MAPA_PCI_INTACK_ADDR
);
}
#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)
...
...
include/asm-ppc/bitops.h
View file @
8b93924a
...
...
@@ -236,8 +236,6 @@ static __inline__ int ffz(unsigned long x)
return
__ilog2
(
x
&
-
x
);
}
#ifdef __KERNEL__
static
inline
int
__ffs
(
unsigned
long
x
)
{
return
__ilog2
(
x
&
-
x
);
...
...
@@ -274,8 +272,6 @@ static __inline__ int fls(unsigned int x)
#define hweight16(x) generic_hweight16(x)
#define hweight8(x) generic_hweight8(x)
#endif
/* __KERNEL__ */
/*
* Find the first bit set in a 140-bit bitmap.
* The first 100 bits are unlikely to be set.
...
...
@@ -395,8 +391,6 @@ static __inline__ unsigned long find_next_zero_bit(unsigned long * addr,
}
#ifdef __KERNEL__
#define ext2_set_bit(nr, addr) __test_and_set_bit((nr) ^ 0x18, (unsigned long *)(addr))
#define ext2_clear_bit(nr, addr) __test_and_clear_bit((nr) ^ 0x18, (unsigned long *)(addr))
...
...
@@ -460,7 +454,5 @@ static __inline__ unsigned long ext2_find_next_zero_bit(void *addr,
#define minix_test_bit(nr,addr) ext2_test_bit(nr,addr)
#define minix_find_first_zero_bit(addr,size) ext2_find_first_zero_bit(addr,size)
#endif
/* __KERNEL__ */
#endif
/* _PPC_BITOPS_H */
#endif
/* __KERNEL__ */
include/asm-ppc/cache.h
View file @
8b93924a
...
...
@@ -39,12 +39,11 @@
__section__(".data.cacheline_aligned")))
#endif
#if
defined(__KERNEL__) && !defined(__ASSEMBLY__)
#if
ndef __ASSEMBLY__
extern
void
clean_dcache_range
(
unsigned
long
start
,
unsigned
long
stop
);
extern
void
flush_dcache_range
(
unsigned
long
start
,
unsigned
long
stop
);
extern
void
invalidate_dcache_range
(
unsigned
long
start
,
unsigned
long
stop
);
extern
void
flush_dcache_all
(
void
);
#endif
/* __ASSEMBLY__ */
/* prep registers for L2 */
...
...
include/asm-ppc/io.h
View file @
8b93924a
...
...
@@ -193,7 +193,6 @@ extern void _outsl_ns(volatile u32 *port, const void *buf, int nl);
#define memcpy_fromio(a,b,c) memcpy((a),(void *)(b),(c))
#define memcpy_toio(a,b,c) memcpy((void *)(a),(b),(c))
#ifdef __KERNEL__
/*
* Map in an area of physical address space, for accessing
* I/O devices etc.
...
...
@@ -265,8 +264,6 @@ extern inline void * phys_to_virt(unsigned long address)
#define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT)
#define page_to_bus(page) (page_to_phys(page) + PCI_DRAM_OFFSET)
#endif
/* __KERNEL__ */
/*
* Enforce In-order Execution of I/O:
* Acts as a barrier to ensure all previous I/O accesses have
...
...
include/asm-ppc/nvram.h
View file @
8b93924a
...
...
@@ -31,8 +31,6 @@ enum {
pmac_nvram_NR
/* MacOS Name Registry partition */
};
#ifdef __KERNEL__
/* Return partition offset in nvram */
extern
int
pmac_get_partition
(
int
partition
);
...
...
@@ -40,8 +38,6 @@ extern int pmac_get_partition(int partition);
extern
u8
pmac_xpram_read
(
int
xpaddr
);
extern
void
pmac_xpram_write
(
int
xpaddr
,
u8
data
);
#endif
/* __KERNEL__ */
/* Some offsets in XPRAM */
#define PMAC_XPRAM_MACHINE_LOC 0xe4
#define PMAC_XPRAM_SOUND_VOLUME 0x08
...
...
include/asm-ppc/page.h
View file @
8b93924a
...
...
@@ -62,7 +62,7 @@ typedef unsigned long pgprot_t;
/* align addr on a size boundry - adjust address up if needed -- Cort */
#define _ALIGN(addr,size) (((addr)+
size-1)&(~(size
-1)))
#define _ALIGN(addr,size) (((addr)+
(size)-1)&(~((size)
-1)))
/* to align the pointer to the (next) page boundary */
#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
...
...
include/asm-ppc/param.h
View file @
8b93924a
...
...
@@ -9,7 +9,7 @@
#define HZ 100
/* internal timer frequency */
#define USER_HZ 100
/* for user interfaces in "ticks" */
#define CLOCKS_PER_SEC (USER_HZ)
/* frequency at which times() counts */
#endif
#endif
/* __KERNEL__ */
#define EXEC_PAGESIZE 4096
...
...
include/asm-ppc/signal.h
View file @
8b93924a
...
...
@@ -111,7 +111,7 @@ typedef struct {
#define SA_PROBE SA_ONESHOT
#define SA_SAMPLE_RANDOM SA_RESTART
#define SA_SHIRQ 0x04000000
#endif
#endif
/* __KERNEL__ */
#define SIG_BLOCK 0
/* for blocking signals */
#define SIG_UNBLOCK 1
/* for unblocking signals */
...
...
@@ -150,7 +150,6 @@ typedef struct sigaltstack {
#ifdef __KERNEL__
#include <asm/sigcontext.h>
#endif
#endif
/* __KERNEL__ */
#endif
include/asm-ppc/socket.h
View file @
8b93924a
...
...
@@ -65,6 +65,6 @@
/* other similar things on the */
/* user level. */
#define SOCK_MAX (SOCK_PACKET+1)
#endif
#endif
/* __KERNEL__ */
#endif
/* _ASM_SOCKET_H */
include/asm-ppc/termios.h
View file @
8b93924a
...
...
@@ -153,7 +153,7 @@ struct termio {
#ifdef __KERNEL__
/* ^C ^\ del ^U ^D 1 0 0 0 0 ^W ^R ^Z ^Q ^S ^V ^U */
#define INIT_C_CC "\003\034\177\025\004\001\000\000\000\000\027\022\032\021\023\026\025"
#endif
#endif
/* __KERNEL__ */
/* modem lines */
#define TIOCM_LE 0x001
...
...
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