Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
OpenBMC Firmware
talos-obmc-linux
Commits
414f746d
Commit
414f746d
authored
16 years ago
by
Ingo Molnar
Browse files
Options
Download
Plain Diff
Merge branch 'linus' into cpus4096
parents
5a7a201c
c9272c4f
Changes
1000
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
150 additions
and
34 deletions
+150
-34
Documentation/DMA-API.txt
Documentation/DMA-API.txt
+2
-2
Documentation/Intel-IOMMU.txt
Documentation/Intel-IOMMU.txt
+2
-2
Documentation/accounting/taskstats-struct.txt
Documentation/accounting/taskstats-struct.txt
+1
-1
Documentation/arm/Interrupts
Documentation/arm/Interrupts
+2
-8
Documentation/cpu-freq/governors.txt
Documentation/cpu-freq/governors.txt
+1
-1
Documentation/edac.txt
Documentation/edac.txt
+1
-1
Documentation/filesystems/omfs.txt
Documentation/filesystems/omfs.txt
+106
-0
Documentation/filesystems/proc.txt
Documentation/filesystems/proc.txt
+2
-2
Documentation/filesystems/relay.txt
Documentation/filesystems/relay.txt
+10
-0
Documentation/filesystems/vfs.txt
Documentation/filesystems/vfs.txt
+3
-3
Documentation/ia64/kvm.txt
Documentation/ia64/kvm.txt
+4
-4
Documentation/input/cs461x.txt
Documentation/input/cs461x.txt
+1
-1
Documentation/ioctl/ioctl-decoding.txt
Documentation/ioctl/ioctl-decoding.txt
+2
-2
Documentation/iostats.txt
Documentation/iostats.txt
+1
-1
Documentation/isdn/README.mISDN
Documentation/isdn/README.mISDN
+6
-0
Documentation/keys.txt
Documentation/keys.txt
+1
-1
Documentation/leds-class.txt
Documentation/leds-class.txt
+1
-1
Documentation/local_ops.txt
Documentation/local_ops.txt
+1
-1
Documentation/networking/bonding.txt
Documentation/networking/bonding.txt
+1
-1
Documentation/networking/can.txt
Documentation/networking/can.txt
+2
-2
No files found.
Too many changes to show.
To preserve performance only
1000 of 1000+
files are displayed.
Plain diff
Email patch
Documentation/DMA-API.txt
View file @
414f746d
...
...
@@ -298,10 +298,10 @@ recommended that you never use these unless you really know what the
cache width is.
int
dma_mapping_error(dma_addr_t dma_addr)
dma_mapping_error(
struct device *dev,
dma_addr_t dma_addr)
int
pci_dma_mapping_error(dma_addr_t dma_addr)
pci_dma_mapping_error(
struct pci_dev *hwdev,
dma_addr_t dma_addr)
In some circumstances dma_map_single and dma_map_page will fail to create
a mapping. A driver can check for these errors by testing the returned
...
...
This diff is collapsed.
Click to expand it.
Documentation/Intel-IOMMU.txt
View file @
414f746d
...
...
@@ -48,7 +48,7 @@ IOVA generation is pretty generic. We used the same technique as vmalloc()
but these are not global address spaces, but separate for each domain.
Different DMA engines may support different number of domains.
We also allocate g
a
urd pages with each mapping, so we can attempt to catch
We also allocate gu
a
rd pages with each mapping, so we can attempt to catch
any overflow that might happen.
...
...
@@ -112,4 +112,4 @@ TBD
- For compatibility testing, could use unity map domain for all devices, just
provide a 1-1 for all useful memory under a single domain for all devices.
- API for paravirt ops for abstracting functionlity for VMM folks.
- API for paravirt ops for abstracting function
a
lity for VMM folks.
This diff is collapsed.
Click to expand it.
Documentation/accounting/taskstats-struct.txt
View file @
414f746d
...
...
@@ -6,7 +6,7 @@ This document contains an explanation of the struct taskstats fields.
There are three different groups of fields in the struct taskstats:
1) Common and basic accounting fields
If CONFIG_TASKSTATS is set, the taskstats inteface is enabled and
If CONFIG_TASKSTATS is set, the taskstats inte
r
face is enabled and
the common fields and basic accounting fields are collected for
delivery at do_exit() of a task.
2) Delay accounting fields
...
...
This diff is collapsed.
Click to expand it.
Documentation/arm/Interrupts
View file @
414f746d
...
...
@@ -138,14 +138,8 @@ So, what's changed?
Set active the IRQ edge(s)/level. This replaces the
SA1111 INTPOL manipulation, and the set_GPIO_IRQ_edge()
function. Type should be one of the following:
#define IRQT_NOEDGE (0)
#define IRQT_RISING (__IRQT_RISEDGE)
#define IRQT_FALLING (__IRQT_FALEDGE)
#define IRQT_BOTHEDGE (__IRQT_RISEDGE|__IRQT_FALEDGE)
#define IRQT_LOW (__IRQT_LOWLVL)
#define IRQT_HIGH (__IRQT_HIGHLVL)
function. Type should be one of IRQ_TYPE_xxx defined in
<linux/irq.h>
3. set_GPIO_IRQ_edge() is obsolete, and should be replaced by set_irq_type.
...
...
This diff is collapsed.
Click to expand it.
Documentation/cpu-freq/governors.txt
View file @
414f746d
...
...
@@ -122,7 +122,7 @@ around '10000' or more.
show_sampling_rate_(min|max): the minimum and maximum sampling rates
available that you may set 'sampling_rate' to.
up_threshold: defines what the average CPU usage
d
between the samplings
up_threshold: defines what the average CPU usage between the samplings
of 'sampling_rate' needs to be for the kernel to make a decision on
whether it should increase the frequency. For example when it is set
to its default value of '80' it means that between the checking
...
...
This diff is collapsed.
Click to expand it.
Documentation/edac.txt
View file @
414f746d
...
...
@@ -327,7 +327,7 @@ Sdram memory scrubbing rate:
'sdram_scrub_rate'
Read/Write attribute file that controls memory scrubbing. The scrubbing
rate is set by writing a minimum bandwith in bytes/sec to the attribute
rate is set by writing a minimum bandwi
d
th in bytes/sec to the attribute
file. The rate will be translated to an internal value that gives at
least the specified rate.
...
...
This diff is collapsed.
Click to expand it.
Documentation/filesystems/omfs.txt
0 → 100644
View file @
414f746d
Optimized MPEG Filesystem (OMFS)
Overview
========
OMFS is a filesystem created by SonicBlue for use in the ReplayTV DVR
and Rio Karma MP3 player. The filesystem is extent-based, utilizing
block sizes from 2k to 8k, with hash-based directories. This
filesystem driver may be used to read and write disks from these
devices.
Note, it is not recommended that this FS be used in place of a general
filesystem for your own streaming media device. Native Linux filesystems
will likely perform better.
More information is available at:
http://linux-karma.sf.net/
Various utilities, including mkomfs and omfsck, are included with
omfsprogs, available at:
http://bobcopeland.com/karma/
Instructions are included in its README.
Options
=======
OMFS supports the following mount-time options:
uid=n - make all files owned by specified user
gid=n - make all files owned by specified group
umask=xxx - set permission umask to xxx
fmask=xxx - set umask to xxx for files
dmask=xxx - set umask to xxx for directories
Disk format
===========
OMFS discriminates between "sysblocks" and normal data blocks. The sysblock
group consists of super block information, file metadata, directory structures,
and extents. Each sysblock has a header containing CRCs of the entire
sysblock, and may be mirrored in successive blocks on the disk. A sysblock may
have a smaller size than a data block, but since they are both addressed by the
same 64-bit block number, any remaining space in the smaller sysblock is
unused.
Sysblock header information:
struct omfs_header {
__be64 h_self; /* FS block where this is located */
__be32 h_body_size; /* size of useful data after header */
__be16 h_crc; /* crc-ccitt of body_size bytes */
char h_fill1[2];
u8 h_version; /* version, always 1 */
char h_type; /* OMFS_INODE_X */
u8 h_magic; /* OMFS_IMAGIC */
u8 h_check_xor; /* XOR of header bytes before this */
__be32 h_fill2;
};
Files and directories are both represented by omfs_inode:
struct omfs_inode {
struct omfs_header i_head; /* header */
__be64 i_parent; /* parent containing this inode */
__be64 i_sibling; /* next inode in hash bucket */
__be64 i_ctime; /* ctime, in milliseconds */
char i_fill1[35];
char i_type; /* OMFS_[DIR,FILE] */
__be32 i_fill2;
char i_fill3[64];
char i_name[OMFS_NAMELEN]; /* filename */
__be64 i_size; /* size of file, in bytes */
};
Directories in OMFS are implemented as a large hash table. Filenames are
hashed then prepended into the bucket list beginning at OMFS_DIR_START.
Lookup requires hashing the filename, then seeking across i_sibling pointers
until a match is found on i_name. Empty buckets are represented by block
pointers with all-1s (~0).
A file is an omfs_inode structure followed by an extent table beginning at
OMFS_EXTENT_START:
struct omfs_extent_entry {
__be64 e_cluster; /* start location of a set of blocks */
__be64 e_blocks; /* number of blocks after e_cluster */
};
struct omfs_extent {
__be64 e_next; /* next extent table location */
__be32 e_extent_count; /* total # extents in this table */
__be32 e_fill;
struct omfs_extent_entry e_entry; /* start of extent entries */
};
Each extent holds the block offset followed by number of blocks allocated to
the extent. The final extent in each table is a terminator with e_cluster
being ~0 and e_blocks being ones'-complement of the total number of blocks
in the table.
If this table overflows, a continuation inode is written and pointed to by
e_next. These have a header but lack the rest of the inode structure.
This diff is collapsed.
Click to expand it.
Documentation/filesystems/proc.txt
View file @
414f746d
...
...
@@ -931,7 +931,7 @@ group_prealloc max_to_scan mb_groups mb_history min_to_scan order2_req
stats stream_req
mb_groups:
This file gives the details of mutiblock allocator buddy cache of free blocks
This file gives the details of mu
l
tiblock allocator buddy cache of free blocks
mb_history:
Multiblock allocation history.
...
...
@@ -1474,7 +1474,7 @@ used because pages_free(1355) is smaller than watermark + protection[2]
normal page requirement. If requirement is DMA zone(index=0), protection[0]
(=0) is used.
zone[i]'s protection[j] is calculated by following exprssion.
zone[i]'s protection[j] is calculated by following expr
e
ssion.
(i < j):
zone[i]->protection[j]
...
...
This diff is collapsed.
Click to expand it.
Documentation/filesystems/relay.txt
View file @
414f746d
...
...
@@ -294,6 +294,16 @@ user-defined data with a channel, and is immediately available
(including in create_buf_file()) via chan->private_data or
buf->chan->private_data.
Buffer-only channels
--------------------
These channels have no files associated and can be created with
relay_open(NULL, NULL, ...). Such channels are useful in scenarios such
as when doing early tracing in the kernel, before the VFS is up. In these
cases, one may open a buffer-only channel and then call
relay_late_setup_files() when the kernel is ready to handle files,
to expose the buffered data to the userspace.
Channel 'modes'
---------------
...
...
This diff is collapsed.
Click to expand it.
Documentation/filesystems/vfs.txt
View file @
414f746d
...
...
@@ -143,7 +143,7 @@ struct file_system_type {
The get_sb() method has the following arguments:
struct file_system_type *fs_type: decribes the filesystem, partly initialized
struct file_system_type *fs_type: de
s
cribes the filesystem, partly initialized
by the specific filesystem code
int flags: mount flags
...
...
@@ -895,9 +895,9 @@ struct dentry_operations {
iput() yourself
d_dname: called when the pathname of a dentry should be generated.
Useful
l
for some pseudo filesystems (sockfs, pipefs, ...) to delay
Useful for some pseudo filesystems (sockfs, pipefs, ...) to delay
pathname generation. (Instead of doing it when dentry is created,
its done only when the path is needed.). Real filesystems probably
it
'
s done only when the path is needed.). Real filesystems probably
dont want to use it, because their dentries are present in global
dcache hash, so their hash should be an invariant. As no lock is
held, d_dname() should not try to modify the dentry itself, unless
...
...
This diff is collapsed.
Click to expand it.
Documentation/ia64/kvm.txt
View file @
414f746d
...
...
@@ -50,9 +50,9 @@ Note: For step 2, please make sure that host page size == TARGET_PAGE_SIZE of qe
/usr/local/bin/qemu-system-ia64 -smp xx -m 512 -hda $your_image
(xx is the number of virtual processors for the guest, now the maximum value is 4)
5. Known possib
i
le issue on some platforms with old Firmware.
5. Known possible issue on some platforms with old Firmware.
I
f meet
strange host crash
e
issues, try to solve it through either of the following ways:
I
n the event of
strange host crash issues, try to solve it through either of the following ways:
(1): Upgrade your Firmware to the latest one.
...
...
@@ -65,8 +65,8 @@ index 0b53344..f02b0f7 100644
mov ar.pfs = loc1
mov rp = loc0
;;
- srlz.d // seralize restoration of psr.l
+ srlz.i // seralize restoration of psr.l
- srlz.d // ser
i
alize restoration of psr.l
+ srlz.i // ser
i
alize restoration of psr.l
+ ;;
br.ret.sptk.many b0
END(ia64_pal_call_static)
...
...
This diff is collapsed.
Click to expand it.
Documentation/input/cs461x.txt
View file @
414f746d
...
...
@@ -31,7 +31,7 @@ The driver works with ALSA drivers simultaneously. For example, the xracer
uses joystick as input device and PCM device as sound output in one time.
There are no sound or input collisions detected. The source code have
comments about them; but I've found the joystick can be initialized
separately of ALSA modules. So, you can
m
use only one joystick driver
separately of ALSA modules. So, you can use only one joystick driver
without ALSA drivers. The ALSA drivers are not needed to compile or
run this driver.
...
...
This diff is collapsed.
Click to expand it.
Documentation/ioctl/ioctl-decoding.txt
View file @
414f746d
To decode a hex IOCTL code:
Most architecures use this generic format, but check
Most architec
t
ures use this generic format, but check
include/ARCH/ioctl.h for specifics, e.g. powerpc
uses 3 bits to encode read/write and 13 bits for size.
...
...
@@ -18,7 +18,7 @@ uses 3 bits to encode read/write and 13 bits for size.
7-0 function #
So for example 0x82187201 is a read with arg length of 0x218,
So for example 0x82187201 is a read with arg length of 0x218,
character 'r' function 1. Grepping the source reveals this is:
#define VFAT_IOCTL_READDIR_BOTH _IOR('r', 1, struct dirent [2])
This diff is collapsed.
Click to expand it.
Documentation/iostats.txt
View file @
414f746d
...
...
@@ -143,7 +143,7 @@ disk and partition statistics are consistent again. Since we still don't
keep record of the partition-relative address, an operation is attributed to
the partition which contains the first sector of the request after the
eventual merges. As requests can be merged across partition, this could lead
to some (probably insignificant) in
n
acuracy.
to some (probably insignificant) ina
c
curacy.
Additional notes
----------------
...
...
This diff is collapsed.
Click to expand it.
Documentation/isdn/README.mISDN
0 → 100644
View file @
414f746d
mISDN is a new modular ISDN driver, in the long term it should replace
the old I4L driver architecture for passiv ISDN cards.
It was designed to allow a broad range of applications and interfaces
but only have the basic function in kernel, the interface to the user
space is based on sockets with a own address family AF_ISDN.
This diff is collapsed.
Click to expand it.
Documentation/keys.txt
View file @
414f746d
...
...
@@ -864,7 +864,7 @@ payload contents" for more information.
request_key_with_auxdata() respectively.
These two functions return with the key potentially still under
construction. To wait for contruction completion, the following should be
construction. To wait for con
s
truction completion, the following should be
called:
int wait_for_key_construction(struct key *key, bool intr);
...
...
This diff is collapsed.
Click to expand it.
Documentation/leds-class.txt
View file @
414f746d
...
...
@@ -59,7 +59,7 @@ Hardware accelerated blink of LEDs
Some LEDs can be programmed to blink without any CPU interaction. To
support this feature, a LED driver can optionally implement the
blink_set() function (see <linux/leds.h>). If implemeted, triggers can
blink_set() function (see <linux/leds.h>). If impleme
n
ted, triggers can
attempt to use it before falling back to software timers. The blink_set()
function should return 0 if the blink setting is supported, or -EINVAL
otherwise, which means that LED blinking will be handled by software.
...
...
This diff is collapsed.
Click to expand it.
Documentation/local_ops.txt
View file @
414f746d
...
...
@@ -36,7 +36,7 @@ It can be done by slightly modifying the standard atomic operations : only
their UP variant must be kept. It typically means removing LOCK prefix (on
i386 and x86_64) and any SMP sychronization barrier. If the architecture does
not have a different behavior between SMP and UP, including asm-generic/local.h
in your archtecture's local.h is sufficient.
in your arch
i
tecture's local.h is sufficient.
The local_t type is defined as an opaque signed long by embedding an
atomic_long_t inside a structure. This is made so a cast from this type to a
...
...
This diff is collapsed.
Click to expand it.
Documentation/networking/bonding.txt
View file @
414f746d
...
...
@@ -631,7 +631,7 @@ xmit_hash_policy
in environments where a layer3 gateway device is
required to reach most destinations.
This algorithm is 802.3ad compli
e
nt.
This algorithm is 802.3ad compli
a
nt.
layer3+4
...
...
This diff is collapsed.
Click to expand it.
Documentation/networking/can.txt
View file @
414f746d
...
...
@@ -186,7 +186,7 @@ solution for a couple of reasons:
The Linux network devices (by default) just can handle the
transmission and reception of media dependent frames. Due to the
arb
r
itration on the CAN bus the transmission of a low prio CAN-ID
arbitration on the CAN bus the transmission of a low prio CAN-ID
may be delayed by the reception of a high prio CAN frame. To
reflect the correct* traffic on the node the loopback of the sent
data has to be performed right after a successful transmission. If
...
...
@@ -481,7 +481,7 @@ solution for a couple of reasons:
- stats_timer: To calculate the Socket CAN core statistics
(e.g. current/maximum frames per second) this 1 second timer is
invoked at can.ko module start time by default. This timer can be
disabled by using stattimer=0 on the module comandline.
disabled by using stattimer=0 on the module com
m
andline.
- debug: (removed since SocketCAN SVN r546)
...
...
This diff is collapsed.
Click to expand it.
Prev
1
2
3
4
5
…
50
Next
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