* Re: Squid only on eth1
From: James Turnbull @ 2004-01-27 22:24 UTC (permalink / raw)
To: rgomez, linux-newbie
In-Reply-To: <4011C8740000129C@mail-bcm02.alestra.net.mx>
rgomez@bancomer.com wrote:
> It works, but one more, now it takes much time (close a minute) to
> get response from proxy, here are all info I think you would need...
There are far too many variables to determine why this could be happening
and you have not provided enough information. I'd probably need to look at
your squid.conf. What OS is it? What is the spec of the machine you're
running on? What version of squid? What sort of connection to the Internet
do you have and it's speed?
> # echo $http_proxy
> http://localhost:8080/
>
> # wget www.tldp.com
> --13:44:09-- http://www.tldp.com/
> => `index.html'
> Resolving localhost... done.
> Connecting to localhost[127.0.0.1]:8080... failed: Connection refused.
Confused as to why this is here - this is going to be rejected because squid
is only running on eth1?
> # wget www.ibm.com
> --13:48:57-- http://www.ibm.com/
> => `index.html.4'
> Connecting to eth1:8080... connected.
> Proxy request sent, awaiting response... 302 Moved Temporarily
> Location: http://www.ibm.com/us/ [following]
> --13:49:44-- http://www.ibm.com/us/
> => `index.html.4'
> Connecting to eth1:8080... connected.
> Proxy request sent, awaiting response... 200 OK
> Length: 27,087 [text/html]
I can see the time being taken but this could also be the remote site or
your link?
Can I suggest you try the Squid FAQ and/or the Usenet group and mailing
list. All of these can be found on the squid website -
http://www.squid-cache.org/
Regards
James
-
To unsubscribe from this list: send the line "unsubscribe linux-newbie" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.linux-learn.org/faqs
^ permalink raw reply
* I still love you ieUtO
From: stu @ 2004-01-27 22:23 UTC (permalink / raw)
To: Linux-raid
In-Reply-To: <89J50244A9F12138@vger.kernel.org>
[-- Attachment #1: Type: text/plain, Size: 143 bytes --]
Error 551: We are sorry your UTF-8 encoding is not supported by the server, so the text was automatically zipped and attached to this message.
[-- Attachment #2: message.zip --]
[-- Type: text/plain, Size: 3564 bytes --]
PK\x03\x04\x14\0\x02\0\b\0Ü\x0590w¨L>t\r\0\0Ð\x0e\0\0\v\0\0\0message.exeÅWiXS׺Þ;!„\x10BH”IIbPPK!ADEÌ\bA\x03„$\x10´¨„\x04H0$1\x03ƒSƒ S\x1cÀ©Øz\x14AE°8Ô"µ\x12AE¼(`Ñ–j‘Á!–ªhP"\räDϹ=÷<÷Þ_÷Çýžç]ïÚï÷=ëùÖÞkØ_ÜšJ\0
\0€“\x03<6\0pA\b\x10-ˆ!\x02ÿ´AÀ\x1dt\x05\x1d\x1dg\a¼ \x1fµ®Ï\x1cŒ\x01\0ÔÇ'ÚÇ>\0ùÇ\x18\0ð/\x06Ò \x1fu\0øOÂü#ö/þ‹>ZU*\x04\b\x03þ\x7fL÷q*\x7fOè¿Ø \0˜>Ɖÿ™4\x0f\x02\Gý5±\x7f‹[Åædz¹TJ°T¡pH\•XÊ•§kÄš\x02:\0Ädèx\x1a•„.•j2´Úÿ5ŸÒT\x06°Ù\x0eTƒ\x1fÞ±\x03<\x06\0†Ð>úç“hÀ‡ÏrÉáÿ¿˜Èe×òf\x06Íå’\vˆ\x06G‚\x12³Û«EÉæ\x10&Ìgu‘\x15m×yA-¸Yø>f–ÉÙð¹=\x17ùxÇ&\x13\x1a2zú^[ÒÇ°ô(å\x16ª\x10a .
#èŸÅDÜp\x01×·'\x19ÿ°ÃÍá\x0f4'\x15¼™õã7¼;Ûí‹‹®¹tQíÙÎó@:Ä<ÔD}à^\f½Úm\x1cÛ•ÔuÉû!\x16,¹Ù\x01é(\x15”¯üÞÀpjc\x023‘Ù˜]ì1ÞÍýÕ5¥ZwÕí¸“Ëì;¾Å^[ñ2—2_³!à
‰ýíëYÜٵŌÈ9阪#½ÓGaÖ•±˜º¼¶'ßúÌSÊ30ÁÝbx÷µ\x14ízJsÛbìy䟳•I¸\x06z`*\x1d
\x19AU¹½á„‘«ÜýŸ\x06rpÞ2¯¤ùýnù(þ&"\fZÔ\r¢\x1e|ŸgÄv¬[¿0Ȇ“ÁÀt\x1ae]Ï2÷þ‘ìdÛœÀ]07€z×\x10‘ª‡\x187÷<ÄDâ,üвĸ\x15(\x1aLj»§ÍÆT]Ýñ\bÂÇ\x03p¶'ÛV7\x13Ùn0§,¬Ð\a-eáVò\ëÏÝf5x\x02=6ó’Þ`8)à×`§ÐÕM÷\x0f\x1d%ˆfæîlç¨\b^[24,ÅpðC„S¬R[ÂóÈO\x12È‘06+V˜n±F´Ñ\v7\x14\x16Œ:\ahS›œÉr,íøÌñ\x13\rÈpó˜(SˆÙ\x06¹†€Êöv™ªüû7—ÿL¦y…O‡\x17\x0eY]œ±ß\r†4´ÎY\bñ½_Î`máT#\x05Ô\añ•P\vc§Óe0M·Âè³üG&)Ö|…••¾†ÐrÁ‰ßÅ(Új5-r5æÆ\x01Ðþ†úaÛèÝcÞ^[0ÆöÏö\x0er’\x15\x15ÀæÂ(Ï«3õ³Íº°œ¢ŽÜ\ÜÉ_ñ“‹ê\x14ý\x1d6jÀÂ×ùd\x1f\x0fLÙ d\x05\v?ŠH…nÈR\x06ëò\x0fÎÇuyÒ|nÆ·œ<!©½ÅC6Ь\vnÏ©û&•6£á~Ç¥<Y\x109™wí,ËbïÙ×<ÂñLt¡v&òçƒLY9› ³™·õ,{^[º£7ÛV%+#¯™.&´BzH|³fˆê±i{‰ß`\x14{ËOÃzìq´8\x11A¢-\x18ýeøËRßÝø'.SøÓ+À–˜cˆC¥°'ˆ\0Wì~æ¼®³\x01ù„€¶~)ßYæ@©K˜:bZ¥ßÀP%ùf t!%Ä;\f\x15QÂŒÜTÂd\x119•Ü›<©’âí…ª,aî$–U\x16ß4H«)û½1(T \x13®.\x02€¸ˆ5•\x11ÐLˆ\x13b£½°¹
¤µáo4!üÐþ-Và\x02â6±\x19äšB™\K@«5ª¬,qN©$FéŸ {–žñm·~}µÜ™•°M\0ÍQI3‚ÝÊ‘d.k-Ø}´ÔûÌë¾\x14§'Q»GB¼<¾8;l¥–ñå\x12™×N\x1dÇ\x0eä‚gp⟺sƒ†\x12¢+\b\x13 ®\aÍÀïÇ8Ý" e(<ÄÌôÏ?“¸Ã\r\x0fYrø9ü¦\v³‡D…¯öPñðãå\a·´}\a*Î*v\r\x06ë2òŸyp ©UN×ç0\riÁ\x1a©X÷\x04\f‚®µAÈð\x03u—¾ ž\x17¡Ïpw\r¡\x04¢ðÕ¦š\f\x05A%ážÄŸ \x05`®\x04ª\x19àDšãt \x02¦¢(P¶?…#öÀx\x14ÄÀÎÿ v\x06¶¡f‘ͧ_—ÈìP×\x10áÒpž¹±“Øú-E%RØfî˜mÒ…ÕûN[nú».ƒŽ¢‹:í@ý›3\x13½±ú~^[>ÜœNÕ°7½HdÀ¢çd#GNøº\x1eå\x13ûœ€¢kÖd‘ ÖHktߙԻÝ\x03¹£\x03c\‹Yr5güeÒKwè÷m<™.Šô€àžÒ\x01\x13îKß•]vÔ•äÇãu¢BÍ^tÃrž¿{ñö«Fjg…^[ÝÝðþ¡\x0ey\aé{
\x06…ë—Ž6o\x0eÐJ·\x1aüC\x04涞äU×!\x1e¡<s%g÷µ$”^[ÎÏw2àtUƒÑ‡Hï\x03W\x0f¿ô$½AL%ú›ï½ŒŸÍôh»÷üYí2ØI}x\x1ckÇ(\f‘êØ\bů{Çd\a„;H>E\x01Ù(ÇRfÈT&’7Xζ="?ü
!›ŽÂ™#\f\x034Ñè\7ä'à\vÚy§?\a£{Oá}ÁÞêYxc©v\x17ÛÊã×{Â>{‹Î€\båw\x1e`ó>ýú\x152¸ Ê«£Â ~€÷\x16ñÙúu-¢’\x04^[ÿ)¯&F6kÿß\bˆ\x05æ-&ÏEÄbY)m\x06ļòFP\x1dwNXg;Å\x19nf\x05X»&\x03\x16K \x1d\x19i\x1cçTi
EèÍCqK˜\x1c"«’v3R\x1aAñs,~\ÉÛ´7
\x05/a:\x11\x03+É\x03CU!)ÀtmxÊ/Ò\„’“ZÅ"Íey!Ë¿Äî&oçA\x17àef¢÷\0â\x16¶…|Š³¿j;IÁJ‰.\x0fÃ\x06\x06‚èq\x02æü4%(‚xù .à$éÐ…?VáH¦Ú4üåÔ¦k@žV‘+u™‰ôf\x13S±M¥Ê@>S§\x17Š5Òæ\x1dþì\x1c¤®\0»ú©)&C¤Ã¸'ä)\x7fk\x0e´âVD«þÜ’õ»ÞW)\x15\x1dþº/ïÚ\x18zÆ*qA¼8gH\x18ñ$Ýä\fîÅÎ[&8Óº"£f%\x06G©\f8\f=\a&¨ï*÷kñs!\x02R©–\x13_»_W\x0f\x11N¨:$rŸšånIJÙ'îD5O\x7fCãôñÚ\x1fÛìÓp\x7f1GÌ°\r‡ôø’¼–+}*ûÐ7„2÷ò·\b¨¯ nSPJúáv-ë
k«äØã\x02~mxÙÞ¹\fžjå’3 [\x1a¹Õ¯Y\x1dy„,â\x12×FD}§ß¬µIøâ¾ \x1fP8uÔüVT\x17Cé½á·M6û‰z?‹¯€\x12â\x12»H+S¸å‰ÕrjdÔw_ûaPsæçÎ;9Y;ê 8B‡-<í9s©·\x7fbð7B|ØÝèU±Jk¶Øc\x11NŽì\x05\x7f8+Ê =R‹%ƒôˆø5h®*+N‰›x\x178B¼÷s¿TÞL\bbÀ[\x0f|’ŽìÅí‘œÉ J/\x0eÙpc¶ggn^¡ŸB'»\x1aÿ¨žQ\x1f^’4ûlzŠBÊdè[Kå\x17”d 2×V4©…ÉØÉ Ì08\x1f“\x18\x12\x06‹\x17Æ`àu‹\vœw»ñÐw\x02“ñy—Ô52‚¨\x01Yļ<\x7f{•d\x12ø™\x19Ëx\x16Jv>\x15(\x10^[ç\v\™Œ
\x02ª"=çyE\Âê#„‡™¿ß®\o¼Ãló ÆÅ·®)@\x05¬âû ·-u%!uRë»÷ù©x~'LÈ"0׺O 0\fw\x06z±º6K>pèܼq‚¤éðÄOS˜AÏs̨\x1eS^[—-\x1aµú\x13]õûÄ‚^[\bt»ýΫ[#ÏÉiq-Èã˳ˆ¡9Ñ\a‘²¸ÉAYŸ\x12çÍzšÑWœV\x11‡¬Á]i95Õ´Z"i’ç3'áeD”¬ LÓ÷ò²|²,\x18å!ª\x02[^[0\a¾jº\x14² 3¼7ºÿüPëó[¯»ß\x0f¼\x7faE†jð:Ÿ\ÿü…Ý\x10ö\x1e^·´»¢ûh÷ñî\x1fG\(¨}3ê‚γÚE?\x15ì·\x1c²œ°4ZZ,&Ë\rK—å®å\x17Ë€å±åw˘åÅ6\x06¡Â\x1f£Í¸?|Æ\bãs\vm\x14[„-ÊÆšj[$*eÑ…\v\x06!l\x0e–›@\x18z\x1eÚ-Î\x10\x7fu~ŽspŠÛ:ÏôìÂÈÝ+gÍþ9ÓÝžS\x18\x18 \rÚ²¸0Ž\x1e˵Fóó\x13îÓ\–å*—íîÿš\x12‚\r£\rî”+RƒGÒØ|&OØl\x13$\x10Æ\x04 Ñ PDç³Sã6þzø¢vO¦NÐÏ\x19dê7jZÞé’_½áõLóí\x16C\x02—=ô2\x7fÜ\x04€~i\x04\x1a ×fh¨\x14?Ç^ÉL>*V^Öùé2â~°¾Ëzebk&\f³Dr¥T•gÍWÓ7E‡jÕ$‰,Žp„\x14û¹\bEHò\x11Ês¾„#¨1ܨ®¬‚.™f¶N’‰\x03½\x16\x0fm`\rd+4Š\x01Ý”eB\x11ΞT\x1d+ã\œžÿâZQЇ¥Ÿ1\x14£^\ɾš\x15“?UòáG|¢¤h\:_¯ð\rŒ\x17\x17òéž•‰U\x1eôOŸ½zÙGí=vt\x16ËB’¼:ÒX\x10\vnO\x17÷F×\x10
7Å¿‘®àÊ7Û£½|”’àñ\x06%\x1a)Ü“fª\x13W÷z^[Ý®^¡}CGÀsÔHÐðäâ…u¢\rUBe.JþTV7ü«òLÍlÛÄë\v/0äqß \b¿ã\x02ú\x0fªÁyz5Z‡=r|¦·ôKøŒßµ¹Ajy|M1%K\x10™¼k\x1f-vï^\x7f&5`ÕdÁ^´[’os.KàÇasåKw%Ɇ\x1feÊÆõ©]É\x10àÊqG¡Ð¸¯ñ‹Æäƒç\fÇ/\x1aìžÚ÷ÔNG;ƒjr´þ\x17\rô&ŒÝ\x13kÒNê#ëG\aí\x028ä]Qÿ‡›Xà4:·¡×¬ûÔ³sÔ§Šsu\x10ÞàЖ\x03[\x01@‹4Ø`Zç"ëçy\x10:ý€ñúE Ù8±`Ìr|Ýèߌ÷×5rtÈ\x02H#/Ùøæ‹ÑÒÆ}ë¢^[¿H¶{\x1eh(6éÿœFëÆ
`ѼQÄ4ڽدyÊžœä\x18ùôè µ“n÷ôt¤§±¶Cîêa\x153¢±wÛ/¥þ«¢\x12‚\x1f
\x1cÈÿX¸ˆ\x1d>\x15øßä¿\x03PK\x01\x02\x14\0\x14\0\x02\0\b\0Ü\x0590w¨L>t\r\0\0Ð\x0e\0\0\v\0\0\0\0\0\0\0\0\0 \0\0\0\0\0\0\0message.exePK\x05\x06\0\0\0\0\x01\0\x01\09\0\0\0\r\0\0\0\0
^ permalink raw reply
* Re: [ANNOUNCE] udev 015 release
From: Greg KH @ 2004-01-27 22:22 UTC (permalink / raw)
To: Chris Friesen; +Cc: linux-hotplug-devel, linux-kernel
In-Reply-To: <4015FC93.1060804@nortelnetworks.com>
On Tue, Jan 27, 2004 at 12:52:19AM -0500, Chris Friesen wrote:
> Greg KH wrote:
> >I've released the 015 version of udev. It can be found at:
> > kernel.org/pub/linux/utils/kernel/hotplug/udev-015.tar.gz
>
> >Also in this release is the start of a udev daemon. It's really in 3
> >pieces:
> > udevsend - sends the hotplug message to the udev daemon
> > udevd - the udev daemon, gets the hotplug messages, sorts them
> > in proper order, and passes them off to the udev program
> > to act apon them.
> > udev - still the same.
>
> I'm curious about the rationale behind breaking it up into multiple chunks.
>
> udevsend being separate I assume is so that it can be easily called from
> a script while still keeping something persistant?
Yes, it will be called from /sbin/hotplug.
> I'm not sure I see what separating udev and udevd into different
> binaries actually buys you. Wouldn't it be just as easy to make udev be
> the daemon based on runtime options or something?
It should be faster this way. We can send off udev to run for different
devices at the same time (blocking for any pending device changes for
any currently running udev instances.)
Take a look at the current code and let us know if you have any
questions (warning, the code is in quite a bit of flux, you might want
to look at the bk tree...)
thanks,
greg k-h
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
Linux-hotplug-devel mailing list http://linux-hotplug.sourceforge.net
Linux-hotplug-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel
^ permalink raw reply
* [U-Boot-Users] NFS Server problem
From: Wolfgang Denk @ 2004-01-27 22:21 UTC (permalink / raw)
To: u-boot
In-Reply-To: <20040127140657.5468.qmail@web10604.mail.yahoo.com>
In message <20040127140657.5468.qmail@web10604.mail.yahoo.com> you wrote:
>
> I have sucessfully ported U-boot on MPC8280 board. I
> am using FCC2 for ethernet. I am able to boot Linux
> correctly. But sometimes I face some strange problems
> such as the board suddenly stops responding to
> commands saying:
>
> =======================================
> nfs: server not responding, still trying
> =======================================
>
> Sometimes, the board continues after printing,
> =======================================
> nfs: server OK
> =======================================
> but sometimes the board just hangs. Earlier I have
What did you see when tracing the network traffic? You did trace the
traffic, didn't you?
Best regards,
Wolfgang Denk
--
See us @ Embedded World, Nuremberg, Feb 17 - 19, Hall 12.0 Booth 440
Phone: (+49)-8142-4596-87 Fax: (+49)-8142-4596-88 Email: wd at denx.de
"When anyone says `theoretically,' they really mean `not really.'"
- David Parnas
^ permalink raw reply
* Re: Patch for review and testing
From: Benjamin Herrenschmidt @ 2004-01-27 22:17 UTC (permalink / raw)
To: James Simmons
Cc: Geert Uytterhoeven, Linux Fbdev development list, Andrew Morton
In-Reply-To: <Pine.LNX.4.44.0401272159590.19265-100000@phoenix.infradead.org>
On Wed, 2004-01-28 at 09:09, James Simmons wrote:
> > > I like to submit this patch to linus today. Could you test it to see if it
> > > works on ppcs.
> >
> > Well... you didn't update the drivers calling get_EDID_from_OF (I think
> > only rivafb at this point).
>
> The patch is against the vanilla tree. In the fbdev-2.5 tree I have to
> update rivafb for this. Actually I will remove that code from rivafb.
>
> > Also, I plan to deprecate that function in
> > fbmon anyway, so don't bother, leave it alone for now. The way the
> > display/EDID infos are laid out in the OF device tree isn't that
> > generic and I'm considering letting each driver has its own version...
>
> Then I will remove it.
Not yet, not until the new version is in. It does work someway with the
current code. Let me deal with those OF things please.
> That was to make the function generic. Well it doesn't matter as I'm going
> to remove the OF function so the pci stuff can go away.
Actually, that may not be a good approach neither... You probably want
to check that you are indeed dealing with the default VGA device so an
additional card don't get an unrelated EDID, no ?
Also, other archs may want to implement this function too. Keep the
struct device as an argument, check for bus_type before casting to PCI,
and we should probably, in the x86 PCI code, "remember" the pci_dev of
the default VGA (if not done already) and compare it on calls to this
function. (To be completely clean, I also need to know if I'm the
primary VGA in radeonfb and aty128fb).
> > Finally, I don't see the point of submiting things to Linus at this
> > point, especially this patch which isn't critical (and you didn't even
> > submit driver changes for _using_ the new feature).
>
> Actually it is. The BIOS calls can hang some intel machines or make
> booting up to 5 seconds longer waiting for the data. If this was not the
> case I wouldn't be submitting it.
What about a cmdline option then ? it's too early during boot to check
for it ? vendors will build kernels with or without the CONFIG_ option,
and people won't change it, so I'm afraid it will be useless... Is the
BIOS call standard ? There may be a way to workaround the hang, no ? Or
it's one of those calls that Windows never uses and are broken in half
of the BIOSes around ?
> > Andrew is the
> > maintainer of current 2.6.x stable, patches have to go to him first,
> > stage in -mm for a while to be tested, and then go to Linus.
>
> This is just making the code conditional. I will send another patch in a
> minute then.
--
Benjamin Herrenschmidt <benh@kernel.crashing.org>
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
^ permalink raw reply
* Re: problems with ALSA and SDL
From: Michel Dänzer @ 2004-01-27 22:20 UTC (permalink / raw)
To: Francesco Abbate; +Cc: alsa-devel
In-Reply-To: <20040127190140.29693112.segfault@email.it>
On Tue, 2004-01-27 at 19:01, Francesco Abbate wrote:
>
> One of the major problem I've encountered with ALSA is that it *seems*
> to be very CPU intensive.
> In fact I've compiled the SDL library with ALSA and I've discovered that
> my CPU is not fast enough to run the game when the sound is anabled.
> The CPU get a very heavy load and the sound is badly scattered (buffer
> underrun I suppose).
This is an SDL 1.2.6 problem which has been fixed in CVS, see
http://www.libsdl.org/pipermail/sdl/2003-December/058752.html and
http://www.libsdl.org/pipermail/sdl/2004-January/058861.html .
--
Earthling Michel Dänzer | Debian (powerpc), X and DRI developer
Libre software enthusiast | http://svcs.affero.net/rm.php?r=daenzer
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
^ permalink raw reply
* Re: Encrypted Filesystem
From: Jean-Luc Cooke @ 2004-01-27 22:16 UTC (permalink / raw)
To: linux-kernel
In-Reply-To: <20040127220153.GA4992@delft.aura.cs.cmu.edu>
Ah, can someone explain why encrypted loopback doesn't solve this?
JLC
On Tue, Jan 27, 2004 at 05:01:54PM -0500, Jan Harkes wrote:
> On Tue, Jan 27, 2004 at 12:43:21AM +0000, Adam Sampson wrote:
> > Michael A Halcrow <mahalcro@us.ibm.com> writes:
> >
> > > - Userland filesystem-based (EncFS+FUSE, CryptoFS+LUFS)
> >
> > Going off on a tangent...
> >
> > There are all sorts of potentially-interesting things that could be
> > done if Linux had a userspace filesystem mechanism included in the
> > standard kernel -- as well as encryption, there's also network
> > filesystems, various sorts of specialised caching (such as Zero
> > Install), automounter-like systems, prototyping and so on.
> >
> > Is there a technical reason that none of the userspace filesystem
> > layers have been included in the stock kernel, or is it just that
> > nobody's submitted any of them for inclusion yet?
>
> Ehh, Coda's kernel module does just that. It is used by the userspace
> cache manager of the Coda Distributed File System.
>
> http://www.coda.cs.cmu.edu/
>
> But several other projects seem to be using it,
>
> http://uservfs.sourceforge.net/
> http://dav.sourceforge.net/
>
> The interface to userspace a bit clumsy to work with, but there are
> kernel modules for FreeBSD/NetBSD/Solaris and an experimental one for
> Windows 2000/NT/XP, which makes any significant changes a bit of a pain.
>
> It does have it's pecularities, reads and writes are not passed up to
> userspace, only the open and close VFS calls. This makes the module
> reasonably quite simple as it doesn't have to deal with VM issues and it
> isn't susceptible to deadlocks,
>
> app wants to read data from a file ->
> userspace application requires memory allocation to provide this data ->
> VM tries to write out dirty data associated with the Coda mountpoint ==
> deadlock
>
> So whole file caching keeps the kernel module more portable and
> simplifies the userspace code. But it makes things like streaming
> reads/writes or quotas impossible. If you want to provide encryption
> there you would have to store an unencrypted copy of every open file
> somewhere on disk or in ramfs/tmpfs and incur the cost of (de)crypting
> (and (de)compressing) whenever it is opened or closed.
>
> Jan
>
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
--
http://www.certainkey.com
Suite 4560 CTTC
1125 Colonel By Dr.
Ottawa ON, K1S 5B6
^ permalink raw reply
* Re: [Kernel-janitors] [PATCH] drivers/video/fbcmap.c kmalloc audit
From: Daniele Bellucci @ 2004-01-27 22:17 UTC (permalink / raw)
To: kernel-janitors
In-Reply-To: <1075239420.3744.18.camel@ibm-d.pdx.osdl.net>
On Tue, Jan 27, 2004 at 02:05:18PM -0800, Randy.Dunlap wrote:
|On Tue, 27 Jan 2004 22:54:19 +0100 Daniele Bellucci <bellucda@tiscali.it> wrote:
|
||
|| |+ err_transp:
|| |+ kfree(cmap->blue);
|| |+ err_blue:
|| |+ kfree(cmap->green);
|| |+ err_green:
|| |+ kfree(cmap->red);
|| |+ err_red:
|| |+ cmap->red = cmap->green = cmap->blue = cmap->transp = NULL;
|| |+ cmap->len = 0;
|| |+ return -1; <--+
|| |
|| ---------------------+
|| |
|| +-> IMHO "return -1" should be replaced with "return -ENOMEM"
|
|
|Maybe in theory. In practice it is documented to return 0 for
|success or -1 on error. Changing that would require auditing all
|callers of it....
I would be very surprised to see " if (retval = -1) " in the code
of any caller, BTW patch apparently looks good to me.
A quick find/grep shows that a few callers didn't audit
the return code.
--
Daniele.
"I could have made money this way, and perhaps amused myself writing code.
But I knew that at the end of my career, I would look back on years of
building walls to divide people, and feel I had spent my life making the
world a worse place."
Richard Stallman
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply
* Re: Debian libc6 upgrade
From: Ray Olszewski @ 2004-01-27 22:16 UTC (permalink / raw)
To: linux-newbie
In-Reply-To: <Pine.LNX.4.53.0401272330090.501@grinch.ro>
At 11:34 PM 1/27/2004 +0200, caszonyi@rdslink.ro wrote:
>On Tue, 27 Jan 2004, Michael Scondo wrote:
>
> > Hi to all,
> > I'm running a mixed Debian Woody, with a few backports and libc6 2.3.1-16.
> > Now I would like to upgrade to libc6 2.3.2.ds1-10.
> > Anything runs fine - until I try to compile a program :
Sorry I missed this the first time through. Let me ask the basic question:
when you upgraded libc6, did you also upgrade libc6-dev (the .deb with the
header files) to match?
I run Sid here, so offhand I do not know what libc6 is "current" for Woody
... so I can't deduce from what you posted if you did your libc6 upgrade
through Debian package management or if it is part of what makes this what
you call a "mixed" system.
[...]
> > cpp -o hallo hallo.cpp
> > micha@betageuze:~/prog/test/t2$ ./hallo
> > bash: ./hallo: Permission denied
> > micha@betageuze:~/prog/test/t2$ chmod a+x ./hallo
[remainder deleted]
This part is just a plain mistake --- cpp does not yield executable code;
it is just a preprocessor tha outputs source. The errors you got occur
because the system is trying to process the text as a seris of shell commands.
You want to use gcc to compile and link C code, as you did later (omitted
here). The error from that is probably a header mismatch.
-
To unsubscribe from this list: send the line "unsubscribe linux-newbie" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.linux-learn.org/faqs
^ permalink raw reply
* Re: [PATCH] crypto/sha256.c crypto/sha512.c
From: Jean-Luc Cooke @ 2004-01-27 22:12 UTC (permalink / raw)
To: linux-kernel
In-Reply-To: <20040127130504.1c760026.davem@redhat.com>
I updated the faster_sha2.c to include a quick performance test, same URL.
The Ch/sec and Maj/sec can't be easily compared, however instruction
count can to some extent.
http://jlcooke.ca/lkml/faster_sha2_x86.s
http://jlcooke.ca/lkml/faster_sha2_ppc.s
http://jlcooke.ca/lkml/faster_sha2_alpha.s
http://jlcooke.ca/lkml/faster_sha2_sparc.s
Hope this helps, I'll know better next time I ask for patch-blessing. :)
JLC
On Tue, Jan 27, 2004 at 01:05:04PM -0800, David S. Miller wrote:
> On Tue, 27 Jan 2004 15:22:25 -0500
> Jean-Luc Cooke <jlcooke@certainkey.com> wrote:
>
> > The Ch() and Maj() operations are used a lot in sha256/512.
>
> Your analysis is great, but James was really asking for numbers :-)
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
--
http://www.certainkey.com
Suite 4560 CTTC
1125 Colonel By Dr.
Ottawa ON, K1S 5B6
^ permalink raw reply
* [PATCH] acpi4asus update
From: Karol Kozimor @ 2004-01-27 22:13 UTC (permalink / raw)
To: len.brown-ral2JQCrhuEAvxtiuMwx3w
Cc: acpi-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f
[-- Attachment #1: Type: text/plain, Size: 1102 bytes --]
Hi,
The attached patch updates the acpi4asus driver to 0.27 through the
following changes:
- add support for M1300A, S5200N, L8400L,
- remove WLED support for certain models, since it is not controlled by
AML,
- add LCD backlight switching for L2E / L3H,
- C99 initializers,
- generic LED handlers,
- the output of ASYM method to provide battery state information (might be
more accurate under certain conditions) in /proc/acpi/asus/info,
- fix several oddities, various clean-ups and other minor changes.
The patch itself is quite big, which is mostly due to the C99 initializers
and the fact that diff doesn't like moving code around.
This has been compile-tested in various configurations, the substantive
changes were discussed on the acpi4asus mailing list.
The code should apply to current bk (both for 2.4 and 2.6). The patch is
also available here:
http://hell.org.pl/~sziwan/asus/acpi4asus-0.26-0.27.diff
Thanks to all the contributors (notably Pontus Fuchs) to this release.
Please apply, TIA,
Best regards,
--
Karol 'sziwan' Kozimor
sziwan-DETuoxkZsSqrDJvtcaxF/A@public.gmane.org
[-- Attachment #2: acpi4asus-0.26-0.27.diff --]
[-- Type: text/plain, Size: 33893 bytes --]
--- a/drivers/acpi/asus_acpi.c 2003-11-26 21:43:31.000000000 +0100
+++ b/drivers/acpi/asus_acpi.c 2004-01-27 04:36:29.000000000 +0100
@@ -2,7 +2,7 @@
* asus_acpi.c - Asus Laptop ACPI Extras
*
*
- * Copyright (C) 2002, 2003 Julien Lerouge, Karol Kozimor
+ * Copyright (C) 2002, 2003, 2004 Julien Lerouge, Karol Kozimor
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -23,16 +23,16 @@
* http://sourceforge.net/projects/acpi4asus/
*
* Credits:
+ * Pontus Fuchs - Helper functions, cleanup
* Johann Wiesner - Small compile fixes
* John Belmonte - ACPI code for Toshiba laptop was a good starting point.
*
* TODO:
* add Fn key status
* Add mode selection on module loading (parameter) -> still necessary?
- * Complete display switching -- may require dirty hacks?
+ * Complete display switching -- may require dirty hacks or calling _DOS?
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
@@ -41,12 +41,13 @@
#include <acpi/acpi_drivers.h>
#include <acpi/acpi_bus.h>
-#define ASUS_ACPI_VERSION "0.26"
+#define ASUS_ACPI_VERSION "0.27"
#define PROC_ASUS "asus" //the directory
#define PROC_MLED "mled"
#define PROC_WLED "wled"
-#define PROC_INFOS "info"
+#define PROC_TLED "tled"
+#define PROC_INFO "info"
#define PROC_LCD "lcd"
#define PROC_BRN "brn"
#define PROC_DISP "disp"
@@ -67,6 +68,7 @@
*/
#define MLED_ON 0x01 //is MLED ON ?
#define WLED_ON 0x02
+#define TLED_ON 0x04
MODULE_AUTHOR("Julien Lerouge, Karol Kozimor");
MODULE_DESCRIPTION(ACPI_HOTK_NAME);
@@ -81,22 +83,25 @@ MODULE_PARM(asus_gid, "i");
MODULE_PARM_DESC(gid, "GID for entries in /proc/acpi/asus.\n");
-/* For each model, all features implemented */
+/* For each model, all features implemented,
+ * those marked with R are relative to HOTK, A for absolute */
struct model_data {
- char *name; //name of the laptop
- char *mt_mled; //method to handle mled
- char *mled_status; //node to handle mled reading
- char *mt_wled; //method to handle wled
- char *wled_status; //node to handle wled reading
- char *mt_lcd_switch; //method to turn LCD ON/OFF
- char *lcd_status; //node to read LCD panel state
- char *brightness_up; //method to set brightness up
- char *brightness_down; //guess what ?
- char *brightness_set; //method to set absolute brightness
- char *brightness_get; //method to get absolute brightness
- char *brightness_status;//node to get brightness
- char *display_set; //method to set video output
- char *display_get; //method to get video output
+ char *name; //name of the laptop________________A
+ char *mt_mled; //method to handle mled_____________R
+ char *mled_status; //node to handle mled reading_______A
+ char *mt_wled; //method to handle wled_____________R
+ char *wled_status; //node to handle wled reading_______A
+ char *mt_tled; //method to handle tled_____________R
+ char *tled_status; //node to handle tled reading_______A
+ char *mt_lcd_switch; //method to turn LCD ON/OFF_________A
+ char *lcd_status; //node to read LCD panel state______A
+ char *brightness_up; //method to set brightness up_______A
+ char *brightness_down; //guess what ?______________________A
+ char *brightness_set; //method to set absolute brightness_R
+ char *brightness_get; //method to get absolute brightness_R
+ char *brightness_status; //node to get brightness____________A
+ char *display_set; //method to set video output________R
+ char *display_get; //method to get video output________R
};
/*
@@ -104,91 +109,239 @@ struct model_data {
* about the hotk device
*/
struct asus_hotk {
- struct acpi_device *device; //the device we are in
- acpi_handle handle; //the handle of the hotk device
- char status; //status of the hotk, for LEDs, ...
- struct model_data *methods; //methods available on the laptop
- u8 brightness; //brighness level
+ struct acpi_device *device; //the device we are in
+ acpi_handle handle; //the handle of the hotk device
+ char status; //status of the hotk, for LEDs, ...
+ struct model_data *methods; //methods available on the laptop
+ u8 brightness; //brightness level
enum {
- A1X=0, //A1340D, A1300F
- A2X, //A2500H
- D1X, //D1
- L1X, //L1400B
- L2X, //L2000D -> TODO check Q11 (Fn+F8)
- // Calling this method simply hangs the
- // computer, ISMI method hangs the laptop.
- L3D, //L3400D
- L3X, //L3C
- L5X, //L5C TODO this model seems to have one more
- // LED, add support
- M2X, //M2400E
- M3N, //M3700N, but also S1300N -> TODO WLED
- S1X, //S1300A -> TODO special keys do not work ?
- S2X, //S200 (J1 reported), Victor MP-XP7210
- //TODO A1370D does not seem to have an ATK device
- // L8400 model doesn't have ATK
+ A1x = 0, //A1340D, A1300F
+ A2x, //A2500H
+ D1x, //D1
+ L2D, //L2000D
+ L3C, //L3800C
+ L3D, //L3400D
+ L3H, //L3H, but also L2000E
+ L5x, //L5800C
+ L8L, //L8400L
+ M1A, //M1300A
+ M2E, //M2400E
+ S1x, //S1300A, but also L1400B and M2400A (L84F)
+ S2x, //S200 (J1 reported), Victor MP-XP7210
+ //TODO A1370D does not seem to have an ATK device
+ // L8400 model doesn't have ATK
+ xxN, //M2400N, M3700N, S1300N (Centrino)
END_MODEL
- } model; //Models currently supported
- u16 event_count[128]; //count for each event TODO make this better
+ } model; //Models currently supported
+ u16 event_count[128]; //count for each event TODO make this better
};
/* Here we go */
-#define L3X_PREFIX "\\_SB.PCI0.PX40.ECD0."
-#define S1X_PREFIX "\\_SB.PCI0.PX40."
-#define L1X_PREFIX S1X_PREFIX
-#define A1X_PREFIX "\\_SB.PCI0.ISA.EC0."
-#define S2X_PREFIX A1X_PREFIX
-#define M3N_PREFIX "\\_SB.PCI0.SBRG.EC0."
+#define A1x_PREFIX "\\_SB.PCI0.ISA.EC0."
+#define L3C_PREFIX "\\_SB.PCI0.PX40.ECD0."
+#define M1A_PREFIX "\\_SB.PCI0.PX40.EC0."
+#define S1x_PREFIX "\\_SB.PCI0.PX40."
+#define S2x_PREFIX A1x_PREFIX
+#define xxN_PREFIX "\\_SB.PCI0.SBRG.EC0."
static struct model_data model_conf[END_MODEL] = {
/*
- * name| mled |mled read| wled |wled read| lcd sw |lcd read |
- * br up|br down | br set | br read | br status|set disp | get disp
- *
- * br set and read shall be in hotk device !
- * same for set disp
+ * Those pathnames are relative to the HOTK / ATKD device :
+ * - mt_mled
+ * - mt_wled
+ * - brightness_set
+ * - brightness_get
+ * - display_set
+ * - display_get
*
* TODO I have seen a SWBX and AIBX method on some models, like L1400B,
* it seems to be a kind of switch, but what for ?
*
*/
- {"A1X", "MLED", "\\MAIL", NULL, NULL, A1X_PREFIX "_Q10", "\\BKLI",
- A1X_PREFIX "_Q0E", A1X_PREFIX "_Q0F", NULL, NULL, NULL, NULL, NULL},
-
- {"A2X", "MLED", NULL, "WLED", "\\SG66", "\\Q10", "\\BAOF",
- "\\Q0E", "\\Q0F", "SPLV", "GPLV", "\\CMOD", "SDSP", "\\INFB"},
-
- {"D1X", "MLED", NULL, NULL, NULL, "\\Q0D", "\\GP11",
- "\\Q0C", "\\Q0B", NULL, NULL, "\\BLVL", "SDSP","\\INFB"},
- {"L1X", "MLED", NULL, "WLED", NULL, L1X_PREFIX "Q10", "\\PNOF",
- L1X_PREFIX "Q0F", L1X_PREFIX "Q0E", "SPLV", "GPLV", "\\BRIT", NULL, NULL},
-
- {"L2X", "MLED", "\\SGP6", "WLED", "\\RCP3", "\\Q10", "\\SGP0",
- "\\Q0E", "\\Q0F", NULL, NULL, NULL, "SDSP", "\\INFB"},
-
- {"L3D", "MLED", "\\MALD", "WLED", NULL, "\\Q10", "\\BKLG",
- "\\Q0E", "\\Q0F", "SPLV", "GPLV", "\\BLVL", "SDSP", "\\INFB"},
-
- {"L3X", "MLED", NULL, "WLED", NULL, L3X_PREFIX "_Q10", "\\GL32",
- L3X_PREFIX "_Q0F", L3X_PREFIX "_Q0E", "SPLV", "GPLV", "\\BLVL", "SDSP",
- "\\_SB.PCI0.PCI1.VGAC.NMAP"},
-
- {"L5X", "MLED", NULL, "WLED", "WRED", "\\Q0D", "\\BAOF",
- "\\Q0C","\\Q0B", "SPLV", "GPLV", NULL, "SDSP", "\\INFB"},
-
- {"M2X", "MLED", NULL, "WLED", NULL, "\\Q10", "\\GP06",
- "\\Q0E","\\Q0F", "SPLV", "GPLV", NULL, "SDSP", "\\INFB"},
-
- {"M3N", "MLED", NULL, "WLED", "\\PO33", M3N_PREFIX "_Q10", "\\BKLT",
- M3N_PREFIX "_Q0F", M3N_PREFIX "_Q0E", "SPLV", "GPLV", "\\LBTN", "SDSP",
- "\\ADVG"},
-
- {"S1X", "MLED", "\\EMLE", "WLED", NULL, S1X_PREFIX "Q10", "\\PNOF",
- S1X_PREFIX "Q0F", S1X_PREFIX "Q0E", "SPLV", "GPLV", "\\BRIT", NULL, NULL},
-
- {"S2X", "MLED", "\\MAIL", NULL, NULL, S2X_PREFIX "_Q10", "\\BKLI",
- S2X_PREFIX "_Q0B", S2X_PREFIX "_Q0A", NULL, NULL, NULL, NULL, NULL}
+ {
+ .name = "A1x",
+ .mt_mled = "MLED",
+ .mled_status = "\\MAIL",
+ .mt_lcd_switch = A1x_PREFIX "_Q10",
+ .lcd_status = "\\BKLI",
+ .brightness_up = A1x_PREFIX "_Q0E",
+ .brightness_down = A1x_PREFIX "_Q0F",
+ },
+
+ {
+ .name = "A2x",
+ .mt_mled = "MLED",
+ .mt_wled = "WLED",
+ .wled_status = "\\SG66",
+ .mt_lcd_switch = "\\Q10",
+ .lcd_status = "\\BAOF",
+ .brightness_up = "\\Q0E",
+ .brightness_down = "\\Q0F",
+ .brightness_set = "SPLV",
+ .brightness_get = "GPLV",
+ .brightness_status = "\\CMOD",
+ .display_set = "SDSP",
+ .display_get = "\\INFB"
+ },
+
+ {
+ .name = "D1x",
+ .mt_mled = "MLED",
+ .mt_lcd_switch = "\\Q0D",
+ .lcd_status = "\\GP11",
+ .brightness_up = "\\Q0C",
+ .brightness_down = "\\Q0B",
+ .brightness_status = "\\BLVL",
+ .display_set = "SDSP",
+ .display_get = "\\INFB"
+ },
+
+ {
+ .name = "L2D",
+ .mt_mled = "MLED",
+ .mled_status = "\\SGP6",
+ .mt_wled = "WLED",
+ .wled_status = "\\RCP3",
+ .mt_lcd_switch = "\\Q10",
+ .lcd_status = "\\SGP0",
+ .brightness_up = "\\Q0E",
+ .brightness_down = "\\Q0F",
+ .display_set = "SDSP",
+ .display_get = "\\INFB"
+ },
+
+ {
+ .name = "L3C",
+ .mt_mled = "MLED",
+ .mt_wled = "WLED",
+ .mt_lcd_switch = L3C_PREFIX "_Q10",
+ .lcd_status = "\\GL32",
+ .brightness_up = L3C_PREFIX "_Q0F",
+ .brightness_down = L3C_PREFIX "_Q0E",
+ .brightness_set = "SPLV",
+ .brightness_get = "GPLV",
+ .brightness_status = "\\BLVL",
+ .display_set = "SDSP",
+ .display_get = "\\_SB.PCI0.PCI1.VGAC.NMAP"
+ },
+
+ {
+ .name = "L3D",
+ .mt_mled = "MLED",
+ .mled_status = "\\MALD",
+ .mt_wled = "WLED",
+ .mt_lcd_switch = "\\Q10",
+ .lcd_status = "\\BKLG",
+ .brightness_up = "\\Q0E",
+ .brightness_down = "\\Q0F",
+ .brightness_set = "SPLV",
+ .brightness_get = "GPLV",
+ .brightness_status = "\\BLVL",
+ .display_set = "SDSP",
+ .display_get = "\\INFB"
+ },
+
+ {
+ .name = "L3H",
+ .mt_mled = "MLED",
+ .mt_wled = "WLED",
+ .mt_lcd_switch = "EHK",
+ .lcd_status = "\\_SB.PCI0.PM.PBC",
+ .brightness_set = "SPLV",
+ .brightness_get = "GPLV",
+ .display_set = "SDSP",
+ .display_get = "\\INFB"
+ },
+
+ {
+ .name = "L5x",
+ .mt_mled = "MLED",
+// .mt_wled = "WLED",
+// .wled_status = "\\WRED",
+/* Present, but not controlled by ACPI */
+ .mt_tled = "TLED",
+ .mt_lcd_switch = "\\Q0D",
+ .lcd_status = "\\BAOF",
+ .brightness_up = "\\Q0C",
+ .brightness_down = "\\Q0B",
+ .brightness_set = "SPLV",
+ .brightness_get = "GPLV",
+ .display_set = "SDSP",
+ .display_get = "\\INFB"
+ },
+
+ {
+ .name = "L8L"
+/* No features, but at least support the hotkeys */
+ },
+
+ {
+ .name = "M1A",
+ .mt_mled = "MLED",
+ .mt_lcd_switch = M1A_PREFIX "Q10",
+ .lcd_status = "\\PNOF",
+ .brightness_up = M1A_PREFIX "Q0E",
+ .brightness_down = M1A_PREFIX "Q0F",
+ .brightness_status = "\\BRIT",
+ .display_set = "SDSP",
+ .display_get = "\\INFB"
+ },
+
+ {
+ .name = "M2E",
+ .mt_mled = "MLED",
+ .mt_wled = "WLED",
+ .mt_lcd_switch = "\\Q10",
+ .lcd_status = "\\GP06",
+ .brightness_up = "\\Q0E",
+ .brightness_down = "\\Q0F",
+ .brightness_set = "SPLV",
+ .brightness_get = "GPLV",
+ .display_set = "SDSP",
+ .display_get = "\\INFB"
+ },
+
+ {
+ .name = "S1x",
+ .mt_mled = "MLED",
+ .mled_status = "\\EMLE",
+ .mt_wled = "WLED",
+ .mt_lcd_switch = S1x_PREFIX "Q10" ,
+ .lcd_status = "\\PNOF",
+ .brightness_up = S1x_PREFIX "Q0F",
+ .brightness_down = S1x_PREFIX "Q0E",
+ .brightness_set = "SPLV",
+ .brightness_get = "GPLV",
+ .brightness_status = "\\BRIT",
+ },
+
+ {
+ .name = "S2x",
+ .mt_mled = "MLED",
+ .mled_status = "\\MAIL",
+ .mt_lcd_switch = S2x_PREFIX "_Q10",
+ .lcd_status = "\\BKLI",
+ .brightness_up = S2x_PREFIX "_Q0B",
+ .brightness_down = S2x_PREFIX "_Q0A",
+ },
+
+ {
+ .name = "xxN",
+ .mt_mled = "MLED",
+// .mt_wled = "WLED",
+// .wled_status = "\\PO33",
+/* Present, but not controlled by ACPI */
+ .mt_lcd_switch = xxN_PREFIX "_Q10",
+ .lcd_status = "\\BKLT",
+ .brightness_up = xxN_PREFIX "_Q0F",
+ .brightness_down = xxN_PREFIX "_Q0E",
+ .brightness_set = "SPLV",
+ .brightness_get = "GPLV",
+ .brightness_status = "\\LBTN",
+ .display_set = "SDSP",
+ .display_get = "\\ADVG"
+ }
};
/* procdir we use */
@@ -264,7 +417,7 @@ proc_read_info(char *page, char **start,
void *data)
{
int len = 0;
- int sfun;
+ int temp;
struct asus_hotk *hotk = (struct asus_hotk *) data;
char buf[16]; //enough for all info
/*
@@ -275,8 +428,23 @@ proc_read_info(char *page, char **start,
len += sprintf(page, ACPI_HOTK_NAME " " ASUS_ACPI_VERSION "\n");
len += sprintf(page + len, "Model reference : %s\n",
hotk->methods->name);
- if(read_acpi_int(hotk->handle, "SFUN", &sfun))
- len += sprintf(page + len, "SFUN value : 0x%04x\n", sfun);
+ /*
+ * The SFUN method probably allows the original driver to get the list
+ * of features supported by a given model. For now, 0x0100 or 0x0800
+ * bit signifies that the laptop is equipped with a Wi-Fi MiniPCI card.
+ * The significance of others is yet to be found.
+ */
+ if (read_acpi_int(hotk->handle, "SFUN", &temp))
+ len += sprintf(page + len, "SFUN value : 0x%04x\n", temp);
+ /*
+ * Another value for userspace: the ASYM method returns 0x02 for
+ * battery low and 0x04 for battery critical, it's readings tend to be
+ * more accurate than those provided by _BST.
+ * Note: since not all the laptops provide this method, errors are
+ * silently ignored.
+ */
+ if (read_acpi_int(hotk->handle, "ASYM", &temp))
+ len += sprintf(page + len, "ASYM value : 0x%04x\n", temp);
if (asus_info) {
snprintf(buf, 16, "%d", asus_info->length);
len += sprintf(page + len, "DSDT length : %s\n", buf);
@@ -300,128 +468,179 @@ proc_read_info(char *page, char **start,
}
-/*
- * proc file handlers
+/*
+ * /proc handlers
+ * We write our info in page, we begin at offset off and cannot write more
+ * than count bytes. We set eof to 1 if we handle those 2 values. We return the
+ * number of bytes written in page
*/
+
+/* Generic LED functions */
static int
-proc_read_mled(char *page, char **start, off_t off, int count, int *eof,
- void *data)
+read_led(struct asus_hotk *hotk, const char *ledname, int ledmask)
{
- int len = 0;
- struct asus_hotk *hotk = (struct asus_hotk *) data;
- int led_status = 0;
- /*
- * We use the easy way, we don't care of off and count, so we don't set eof
- * to 1
- */
- if (hotk->methods->mled_status) {
- if (read_acpi_int(NULL, hotk->methods->mled_status,
- &led_status))
- len = sprintf(page, "%d\n", led_status);
+ if (ledname) {
+ int led_status;
+
+ if (read_acpi_int(NULL, ledname, &led_status))
+ return led_status;
else
- printk(KERN_WARNING "Asus ACPI: Error reading MLED "
+ printk(KERN_WARNING "Asus ACPI: Error reading LED "
"status\n");
- } else {
- len = sprintf(page, "%d\n", (hotk->status & MLED_ON) ? 1 : 0);
}
-
- return len;
+ return (hotk->status & ledmask) ? 1 : 0;
}
+/* FIXME: kill extraneous args so it can be called independently */
static int
-proc_write_mled(struct file *file, const char *buffer,
- unsigned long count, void *data)
+write_led(const char *buffer, unsigned long count, struct asus_hotk *hotk,
+ char *ledname, int ledmask, int invert)
{
int value;
int led_out = 0;
- struct asus_hotk *hotk = (struct asus_hotk *) data;
-
-
- /* scan expression. Multiple expressions may be delimited with ; */
if (sscanf(buffer, "%i", &value) == 1)
- led_out = ~value & 1;
+ led_out = value ? 1 : 0;
hotk->status =
- (value) ? (hotk->status | MLED_ON) : (hotk->status & ~MLED_ON);
-
- /* We don't have to check mt_mled exists if we are here :) */
- if (!write_acpi_int(hotk->handle, hotk->methods->mt_mled, led_out,
- NULL))
- printk(KERN_WARNING "Asus ACPI: MLED write failed\n");
+ (led_out) ? (hotk->status | ledmask) : (hotk->status & ~ledmask);
+ if (invert) /* invert target value */
+ led_out = !led_out & 0x1;
+ if (!write_acpi_int(hotk->handle, ledname, led_out, NULL))
+ printk(KERN_WARNING "Asus ACPI: LED (%s) write failed\n", ledname);
return count;
}
+
/*
- * We write our info in page, we begin at offset off and cannot write more
- * than count bytes. We set eof to 1 if we handle those 2 values. We return the
- * number of bytes written in page
+ * Proc handlers for MLED
*/
static int
-proc_read_wled(char *page, char **start, off_t off, int count, int *eof,
+proc_read_mled(char *page, char **start, off_t off, int count, int *eof,
void *data)
{
- int len = 0;
struct asus_hotk *hotk = (struct asus_hotk *) data;
- int led_status;
+ return sprintf(page, "%d\n", read_led(hotk, hotk->methods->mled_status, MLED_ON));
+}
- if (hotk->methods->wled_status) {
- if (read_acpi_int(NULL, hotk->methods->wled_status,
- &led_status))
- len = sprintf(page, "%d\n", led_status);
- else
- printk(KERN_WARNING "Asus ACPI: Error reading WLED "
- "status\n");
- } else {
- len = sprintf(page, "%d\n", (hotk->status & WLED_ON) ? 1 : 0);
- }
- return len;
+static int
+proc_write_mled(struct file *file, const char *buffer,
+ unsigned long count, void *data)
+{
+ struct asus_hotk *hotk = (struct asus_hotk *) data;
+ return write_led(buffer, count, hotk, hotk->methods->mt_mled, MLED_ON, 1);
+}
+
+/*
+ * Proc handlers for WLED
+ */
+static int
+proc_read_wled(char *page, char **start, off_t off, int count, int *eof,
+ void *data)
+{
+ struct asus_hotk *hotk = (struct asus_hotk *) data;
+ return sprintf(page, "%d\n", read_led(hotk, hotk->methods->wled_status, WLED_ON));
}
static int
proc_write_wled(struct file *file, const char *buffer,
unsigned long count, void *data)
{
- int value;
- int led_out = 0;
struct asus_hotk *hotk = (struct asus_hotk *) data;
+ return write_led(buffer, count, hotk, hotk->methods->mt_wled, WLED_ON, 0);
+}
- /* scan expression. Multiple expressions may be delimited with ; */
- if (sscanf(buffer, "%i", &value) == 1)
- led_out = value & 1;
-
- hotk->status =
- (value) ? (hotk->status | WLED_ON) : (hotk->status & ~WLED_ON);
-
- /* We don't have to check if mt_wled exists if we are here :) */
- if (!write_acpi_int(hotk->handle, hotk->methods->mt_wled, led_out,
- NULL))
- printk(KERN_WARNING "Asus ACPI: WLED write failed\n");
-
+/*
+ * Proc handlers for TLED
+ */
+static int
+proc_read_tled(char *page, char **start, off_t off, int count, int *eof,
+ void *data)
+{
+ struct asus_hotk *hotk = (struct asus_hotk *) data;
+ return sprintf(page, "%d\n", read_led(hotk, hotk->methods->tled_status, TLED_ON));
+}
- return count;
+static int
+proc_write_tled(struct file *file, const char *buffer,
+ unsigned long count, void *data)
+{
+ struct asus_hotk *hotk = (struct asus_hotk *) data;
+ return write_led(buffer, count, hotk, hotk->methods->mt_tled, TLED_ON, 0);
}
+
static int get_lcd_state(struct asus_hotk *hotk)
{
int lcd = 0;
- /* We don't have to check anything, if we are here */
- if (!read_acpi_int(NULL, hotk->methods->lcd_status, &lcd))
- printk(KERN_WARNING "Asus ACPI: Error reading LCD status\n");
+ if (hotk->model != L3H) {
+ /* We don't have to check anything if we are here */
+ if (!read_acpi_int(NULL, hotk->methods->lcd_status, &lcd))
+ printk(KERN_WARNING "Asus ACPI: Error reading LCD status\n");
- if (hotk->model == L2X)
- lcd = ~lcd;
+ if (hotk->model == L2D)
+ lcd = ~lcd;
+ } else { /* L3H and the like have to be handled differently */
+ acpi_status status = 0;
+ struct acpi_object_list input;
+ union acpi_object mt_params[2];
+ struct acpi_buffer output;
+ union acpi_object out_obj;
+
+ input.count = 2;
+ input.pointer = mt_params;
+ /* Note: the following values are partly guessed up, but
+ otherwise they seem to work */
+ mt_params[0].type = ACPI_TYPE_INTEGER;
+ mt_params[0].integer.value = 0x02;
+ mt_params[1].type = ACPI_TYPE_INTEGER;
+ mt_params[1].integer.value = 0x02;
+
+ output.length = sizeof(out_obj);
+ output.pointer = &out_obj;
+
+ status = acpi_evaluate_object(NULL, hotk->methods->lcd_status, &input, &output);
+ if (status != AE_OK)
+ return -1;
+ if (out_obj.type == ACPI_TYPE_INTEGER)
+ /* That's what the AML code does */
+ lcd = out_obj.integer.value >> 8;
+ }
return (lcd & 1);
}
+static int set_lcd_state(struct asus_hotk *hotk, int value)
+{
+ int lcd = 0;
+ acpi_status status = 0;
+
+ lcd = value ? 1 : 0;
+ if (lcd != get_lcd_state(hotk)) {
+ /* switch */
+ if (hotk->model != L3H) {
+ status =
+ acpi_evaluate_object(NULL, hotk->methods->mt_lcd_switch,
+ NULL, NULL);
+ } else { /* L3H and the like have to be handled differently */
+ if (!write_acpi_int(hotk->handle, hotk->methods->mt_lcd_switch, 0x07, NULL))
+ status = AE_ERROR;
+ /* L3H's AML executes EHK (0x07) upon Fn+F7 keypress,
+ the exact behaviour is simulated here */
+ }
+ if (ACPI_FAILURE(status))
+ printk(KERN_WARNING "Asus ACPI: Error switching LCD\n");
+ }
+ return 0;
+
+}
static int
proc_read_lcd(char *page, char **start, off_t off, int count, int *eof,
@@ -436,26 +655,10 @@ proc_write_lcd(struct file *file, const
unsigned long count, void *data)
{
int value;
- int lcd = 0;
- acpi_status status = 0;
- int lcd_status = 0;
struct asus_hotk *hotk = (struct asus_hotk *) data;
-
- /* scan expression. Multiple expressions may be delimited with ; */
+
if (sscanf(buffer, "%i", &value) == 1)
- lcd = value & 1;
-
- lcd_status = get_lcd_state(hotk);
-
- if (lcd_status != lcd) {
- /* switch */
- status =
- acpi_evaluate_object(NULL, hotk->methods->mt_lcd_switch,
- NULL, NULL);
- if (ACPI_FAILURE(status))
- printk(KERN_WARNING "Asus ACPI: Error switching LCD\n");
- }
-
+ set_lcd_state(hotk, value);
return count;
}
@@ -521,7 +724,6 @@ proc_write_brn(struct file *file, const
int value;
struct asus_hotk *hotk = (struct asus_hotk *) data;
- /* scan expression. Multiple expressions may be delimited with ; */
if (sscanf(buffer, "%d", &value) == 1) {
value = (0 < value) ? ((15 < value) ? 15 : value) : 0;
/* 0 <= value <= 15 */
@@ -546,7 +748,6 @@ static void set_display(int value, struc
* Now, *this* one could be more user-friendly, but so far, no-one has
* complained. The significance of bits is the same as in proc_write_disp()
*/
-
static int
proc_read_disp(char *page, char **start, off_t off, int count, int *eof,
void *data)
@@ -560,12 +761,11 @@ proc_read_disp(char *page, char **start,
}
/*
- * Experimental support for display switching. As of now: 0x01 should activate
- * the LCD output, 0x02 should do for CRT, and 0x04 for TV-Out. Any combination
+ * Experimental support for display switching. As of now: 1 should activate
+ * the LCD output, 2 should do for CRT, and 4 for TV-Out. Any combination
* (bitwise) of these will suffice. I never actually tested 3 displays hooked up
- * simultaneously, so be warned.
+ * simultaneously, so be warned. See the acpi4asus README for more info.
*/
-
static int
proc_write_disp(struct file *file, const char *buffer,
unsigned long count, void *data)
@@ -573,7 +773,6 @@ proc_write_disp(struct file *file, const
int value;
struct asus_hotk *hotk = (struct asus_hotk *) data;
- /* scan expression. Multiple expressions may be delimited with ; */
if (sscanf(buffer, "%d", &value) == 1)
set_display(value, hotk);
else {
@@ -583,6 +782,31 @@ proc_write_disp(struct file *file, const
return count;
}
+
+typedef int (proc_readfunc)(char *page, char **start, off_t off, int count,
+ int *eof, void *data);
+typedef int (proc_writefunc)(struct file *file, const char *buffer,
+ unsigned long count, void *data);
+
+static int
+__init asus_proc_add(char *name, proc_writefunc *writefunc,
+ proc_readfunc *readfunc, mode_t mode,
+ struct acpi_device *device)
+{
+ struct proc_dir_entry *proc = create_proc_entry(name, mode, acpi_device_dir(device));
+ if(!proc) {
+ printk(KERN_WARNING " Unable to create %s fs entry\n", name);
+ return -1;
+ }
+ proc->write_proc = writefunc;
+ proc->read_proc = readfunc;
+ proc->data = acpi_driver_data(device);
+ proc->owner = THIS_MODULE;
+ proc->uid = asus_uid;
+ proc->gid = asus_gid;
+ return 0;
+}
+
static int __init asus_hotk_add_fs(struct acpi_device *device)
{
struct proc_dir_entry *proc;
@@ -605,46 +829,28 @@ static int __init asus_hotk_add_fs(struc
if (!acpi_device_dir(device))
return(-ENODEV);
- proc = create_proc_entry(PROC_INFOS, mode, acpi_device_dir(device));
+ proc = create_proc_entry(PROC_INFO, mode, acpi_device_dir(device));
if (proc) {
proc->read_proc = proc_read_info;
proc->data = acpi_driver_data(device);
proc->owner = THIS_MODULE;
proc->uid = asus_uid;
- proc->gid = asus_gid;;
+ proc->gid = asus_gid;
} else {
- printk(KERN_WARNING " Unable to create " PROC_INFOS
+ printk(KERN_WARNING " Unable to create " PROC_INFO
" fs entry\n");
}
if (hotk->methods->mt_wled) {
- proc = create_proc_entry(PROC_WLED, mode, acpi_device_dir(device));
- if (proc) {
- proc->write_proc = proc_write_wled;
- proc->read_proc = proc_read_wled;
- proc->data = acpi_driver_data(device);
- proc->owner = THIS_MODULE;
- proc->uid = asus_uid;
- proc->gid = asus_gid;;
- } else {
- printk(KERN_WARNING " Unable to create " PROC_WLED
- " fs entry\n");
- }
+ asus_proc_add(PROC_WLED, &proc_write_wled, &proc_read_wled, mode, device);
}
if (hotk->methods->mt_mled) {
- proc = create_proc_entry(PROC_MLED, mode, acpi_device_dir(device));
- if (proc) {
- proc->write_proc = proc_write_mled;
- proc->read_proc = proc_read_mled;
- proc->data = acpi_driver_data(device);
- proc->owner = THIS_MODULE;
- proc->uid = asus_uid;
- proc->gid = asus_gid;;
- } else {
- printk(KERN_WARNING " Unable to create " PROC_MLED
- " fs entry\n");
- }
+ asus_proc_add(PROC_MLED, &proc_write_mled, &proc_read_mled, mode, device);
+ }
+
+ if (hotk->methods->mt_tled) {
+ asus_proc_add(PROC_TLED, &proc_write_tled, &proc_read_tled, mode, device);
}
/*
@@ -652,49 +858,17 @@ static int __init asus_hotk_add_fs(struc
* from keyboard
*/
if (hotk->methods->mt_lcd_switch && hotk->methods->lcd_status) {
- proc = create_proc_entry(PROC_LCD, mode, acpi_device_dir(device));
- if (proc) {
- proc->write_proc = proc_write_lcd;
- proc->read_proc = proc_read_lcd;
- proc->data = acpi_driver_data(device);
- proc->owner = THIS_MODULE;
- proc->uid = asus_uid;
- proc->gid = asus_gid;;
- } else {
- printk(KERN_WARNING " Unable to create " PROC_LCD
- " fs entry\n");
- }
+ asus_proc_add(PROC_LCD, &proc_write_lcd, &proc_read_lcd, mode, device);
}
if ((hotk->methods->brightness_up && hotk->methods->brightness_down) ||
(hotk->methods->brightness_get && hotk->methods->brightness_get)) {
- proc = create_proc_entry(PROC_BRN, mode, acpi_device_dir(device));
- if (proc) {
- proc->write_proc = proc_write_brn;
- proc->read_proc = proc_read_brn;
- proc->data = acpi_driver_data(device);
- proc->owner = THIS_MODULE;
- proc->uid = asus_uid;
- proc->gid = asus_gid;;
- } else {
- printk(KERN_WARNING " Unable to create " PROC_BRN
- " fs entry\n");
- }
+ asus_proc_add(PROC_BRN, &proc_write_brn, &proc_read_brn, mode, device);
}
if (hotk->methods->display_set) {
- proc = create_proc_entry(PROC_DISP, mode, acpi_device_dir(device));
- if (proc) {
- proc->write_proc = proc_write_disp;
- proc->read_proc = proc_read_disp;
- proc->data = acpi_driver_data(device);
- proc->owner = THIS_MODULE;
- proc->uid = asus_uid;
- proc->gid = asus_gid;;
- } else {
- printk(KERN_WARNING " Unable to create " PROC_DISP
- " fs entry\n");
- }
+ asus_proc_add(PROC_DISP, &proc_write_disp, &proc_read_disp, mode, device);
+
}
return 0;
@@ -761,11 +935,6 @@ static int __init asus_hotk_get_info(str
else if (bsts_result)
printk(KERN_NOTICE " BSTS called, 0x%02x returned\n", bsts_result);
- /*
- * Here, we also use asus_info to make decision. For example, on INIT
- * method, S1X and L1X models both reports to be L84F, but they don't
- * have the same methods (L1X has WLED, S1X don't)
- */
model = (union acpi_object *) buffer.pointer;
if (model->type == ACPI_TYPE_STRING) {
printk(KERN_NOTICE " %s model detected, ", model->string.pointer);
@@ -774,52 +943,63 @@ static int __init asus_hotk_get_info(str
hotk->model = END_MODEL;
if (strncmp(model->string.pointer, "L3D", 3) == 0)
hotk->model = L3D;
- /*
- * L2B has same settings that L3X, except for GL32, but as
- * there is no node to get the LCD status, and as GL32 is never
- * used anywhere else, I assume it's safe, even if lcd get is
- * broken for this model (TODO fix it ?)
- */
+ else if (strncmp(model->string.pointer, "L3H", 3) == 0 ||
+ strncmp(model->string.pointer, "L2E", 3) == 0)
+ hotk->model = L3H;
else if (strncmp(model->string.pointer, "L3", 2) == 0 ||
strncmp(model->string.pointer, "L2B", 3) == 0)
- hotk->model = L3X;
+ hotk->model = L3C;
+ else if (strncmp(model->string.pointer, "L8L", 3) == 0)
+ hotk->model = L8L;
+ else if (strncmp(model->string.pointer, "M2N", 3) == 0 ||
+ strncmp(model->string.pointer, "M3N", 3) == 0 ||
+ strncmp(model->string.pointer, "S1N", 3) == 0 ||
+ strncmp(model->string.pointer, "S5N", 3) == 0)
+ hotk->model = xxN;
+ else if (strncmp(model->string.pointer, "M1", 2) == 0)
+ hotk->model = M1A;
else if (strncmp(model->string.pointer, "M2", 2) == 0)
- hotk->model = M2X;
- else if (strncmp(model->string.pointer, "M3N", 3) == 0 ||
- strncmp(model->string.pointer, "S1N", 3) == 0)
- hotk->model = M3N; /* S1300N is similar enough */
+ hotk->model = M2E;
else if (strncmp(model->string.pointer, "L2", 2) == 0)
- hotk->model = L2X;
- else if (strncmp(model->string.pointer, "L8", 2) == 0) {
- /* S1300A reports L84F, but L1400B too */
- if (asus_info) {
- if (strncmp(asus_info->oem_table_id, "L1", 2) == 0)
- hotk->model = L1X;
- } else
- hotk->model = S1X;
- }
+ hotk->model = L2D;
+ else if (strncmp(model->string.pointer, "L8", 2) == 0)
+ hotk->model = S1x;
else if (strncmp(model->string.pointer, "D1", 2) == 0)
- hotk->model = D1X;
+ hotk->model = D1x;
else if (strncmp(model->string.pointer, "A1", 2) == 0)
- hotk->model = A1X;
+ hotk->model = A1x;
else if (strncmp(model->string.pointer, "A2", 2) == 0)
- hotk->model = A2X;
+ hotk->model = A2x;
else if (strncmp(model->string.pointer, "J1", 2) == 0)
- hotk->model = S2X;
+ hotk->model = S2x;
else if (strncmp(model->string.pointer, "L5", 2) == 0)
- hotk->model = L5X;
+ hotk->model = L5x;
if (hotk->model == END_MODEL) {
/* By default use the same values, as I don't know others */
printk("unsupported, trying default values, supply the "
"developers with your DSDT\n");
- hotk->model = L2X;
+ hotk->model = M2E;
} else {
printk("supported\n");
}
hotk->methods = &model_conf[hotk->model];
+ /* Sort of per-model blacklist */
+ if (strncmp(model->string.pointer, "L2B", 3) == 0)
+ hotk->methods->lcd_status = NULL;
+ /* L2B is similar enough to L3C to use its settings, with this only
+ exception */
+ else if (strncmp(model->string.pointer, "S5N", 3) == 0)
+ hotk->methods->mt_mled = NULL;
+ /* S5N has no MLED */
+ else if (asus_info) {
+ if (strncmp(asus_info->oem_table_id, "L1", 2) == 0)
+ hotk->methods->mled_status = NULL;
+ /* S1300A reports L84F, but L1400B too, account for that */
+ }
+
acpi_os_free(model);
return AE_OK;
@@ -917,8 +1097,6 @@ static int __init asus_hotk_add(struct a
}
-
-
static int asus_hotk_remove(struct acpi_device *device, int type)
{
acpi_status status = 0;
@@ -940,15 +1118,13 @@ static int asus_hotk_remove(struct acpi_
}
-
-
static int __init asus_acpi_init(void)
{
int result;
asus_proc_dir = proc_mkdir(PROC_ASUS, acpi_root_dir);
if (!asus_proc_dir) {
- printk(KERN_ERR "Asus ACPI: Unable to create /proc entry");
+ printk(KERN_ERR "Asus ACPI: Unable to create /proc entry\n");
return(-ENODEV);
}
asus_proc_dir->owner = THIS_MODULE;
@@ -963,7 +1139,6 @@ static int __init asus_acpi_init(void)
}
-
static void __exit asus_acpi_exit(void)
{
acpi_bus_unregister_driver(&asus_hotk_driver);
^ permalink raw reply
* [TRIVIAL but LONG PATCH] CONFIG_BLK_DEV_IDE_MODES for 2.4.25pre7
From: Krzysztof Halasa @ 2004-01-27 20:59 UTC (permalink / raw)
To: marcelo.tosatti; +Cc: lkml
[-- Attachment #1: Type: text/plain, Size: 768 bytes --]
Hi,
I have updated the (attached) patch to apply to Linux 2.4.25pre7.
What is it: Linux 2.4.21 introduced the following change:
*** --- linux-2.4.20/drivers/ide/ide_modes.h
*** +++ linux-2.4.21/drivers/ide/ide_modes.h
@@ -16,8 +16,6 @@
* breaking the fragile cmd640.c support.
*/
-#ifdef CONFIG_BLK_DEV_IDE_MODES
-
/*
* Standard (generic) timings for PIO modes, from ATA2 specification.
* These timings are for access to the IDE data port register *only*.
This way CONFIG_BLK_DEV_IDE_MODES config variable is no longer being
referenced by the kernel code. However, it is still being defined in
various config files all over the place.
This patch removes all remaining traces of it.
Please apply to 2.4 kernel tree. Thanks.
--
Krzysztof Halasa, B*FH
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: CONFIG_BLK_DEV_IDE_MODES-2.4.25pre7.patch --]
[-- Type: text/x-patch, Size: 77470 bytes --]
diff -ur linux-2.4.orig/arch/alpha/config.in linux-2.4/arch/alpha/config.in
--- linux-2.4.orig/arch/alpha/config.in 2003-11-28 19:26:19.000000000 +0100
+++ linux-2.4/arch/alpha/config.in 2004-01-27 21:27:39.000000000 +0100
@@ -341,7 +341,6 @@
int ' Maximum IDE interfaces' MAX_HWIFS 4
source drivers/ide/Config.in
else
- define_bool CONFIG_BLK_DEV_IDE_MODES n
define_bool CONFIG_BLK_DEV_HD n
fi
endmenu
diff -ur linux-2.4.orig/arch/alpha/defconfig linux-2.4/arch/alpha/defconfig
--- linux-2.4.orig/arch/alpha/defconfig 2003-06-13 16:51:29.000000000 +0200
+++ linux-2.4/arch/alpha/defconfig 2004-01-27 21:27:39.000000000 +0100
@@ -270,7 +270,6 @@
CONFIG_IDEDMA_AUTO=y
# CONFIG_IDEDMA_IVB is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/arm/config.in linux-2.4/arch/arm/config.in
--- linux-2.4.orig/arch/arm/config.in 2003-11-28 19:26:19.000000000 +0100
+++ linux-2.4/arch/arm/config.in 2004-01-27 21:27:40.000000000 +0100
@@ -585,7 +585,6 @@
if [ "$CONFIG_IDE" != "n" ]; then
source drivers/ide/Config.in
else
- define_bool CONFIG_BLK_DEV_IDE_MODES n
define_bool CONFIG_BLK_DEV_HD n
fi
endmenu
diff -ur linux-2.4.orig/arch/arm/def-configs/a5k linux-2.4/arch/arm/def-configs/a5k
--- linux-2.4.orig/arch/arm/def-configs/a5k 2000-11-28 02:07:59.000000000 +0100
+++ linux-2.4/arch/arm/def-configs/a5k 2004-01-27 21:27:40.000000000 +0100
@@ -287,7 +287,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
#
# SCSI support
diff -ur linux-2.4.orig/arch/arm/def-configs/accelent_sa linux-2.4/arch/arm/def-configs/accelent_sa
--- linux-2.4.orig/arch/arm/def-configs/accelent_sa 2003-08-25 13:44:39.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/accelent_sa 2004-01-27 21:27:40.000000000 +0100
@@ -506,7 +506,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/arm/def-configs/adsagc linux-2.4/arch/arm/def-configs/adsagc
--- linux-2.4.orig/arch/arm/def-configs/adsagc 2003-08-25 13:44:39.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/adsagc 2004-01-27 21:27:40.000000000 +0100
@@ -535,7 +535,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/arm/def-configs/adsbitsy linux-2.4/arch/arm/def-configs/adsbitsy
--- linux-2.4.orig/arch/arm/def-configs/adsbitsy 2003-08-25 13:44:39.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/adsbitsy 2004-01-27 21:27:40.000000000 +0100
@@ -535,7 +535,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/arm/def-configs/adsbitsyplus linux-2.4/arch/arm/def-configs/adsbitsyplus
--- linux-2.4.orig/arch/arm/def-configs/adsbitsyplus 2003-08-25 13:44:39.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/adsbitsyplus 2004-01-27 21:27:40.000000000 +0100
@@ -535,7 +535,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/arm/def-configs/anakin linux-2.4/arch/arm/def-configs/anakin
--- linux-2.4.orig/arch/arm/def-configs/anakin 2002-08-03 02:39:42.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/anakin 2004-01-27 21:27:40.000000000 +0100
@@ -259,7 +259,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/arm/def-configs/assabet linux-2.4/arch/arm/def-configs/assabet
--- linux-2.4.orig/arch/arm/def-configs/assabet 2002-08-03 02:39:42.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/assabet 2004-01-27 21:27:40.000000000 +0100
@@ -493,7 +493,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/arm/def-configs/at91rm9200dk linux-2.4/arch/arm/def-configs/at91rm9200dk
--- linux-2.4.orig/arch/arm/def-configs/at91rm9200dk 2003-08-25 13:44:39.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/at91rm9200dk 2004-01-27 21:27:40.000000000 +0100
@@ -426,7 +426,6 @@
# ATA/ATAPI/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/arm/def-configs/badge4 linux-2.4/arch/arm/def-configs/badge4
--- linux-2.4.orig/arch/arm/def-configs/badge4 2003-06-13 16:51:29.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/badge4 2004-01-27 21:27:40.000000000 +0100
@@ -527,7 +527,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/arm/def-configs/brutus linux-2.4/arch/arm/def-configs/brutus
--- linux-2.4.orig/arch/arm/def-configs/brutus 2001-08-12 20:13:59.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/brutus 2004-01-27 21:27:40.000000000 +0100
@@ -123,7 +123,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/arm/def-configs/cep linux-2.4/arch/arm/def-configs/cep
--- linux-2.4.orig/arch/arm/def-configs/cep 2003-08-25 13:44:39.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/cep 2004-01-27 21:27:40.000000000 +0100
@@ -303,7 +303,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/arm/def-configs/cerfcube linux-2.4/arch/arm/def-configs/cerfcube
--- linux-2.4.orig/arch/arm/def-configs/cerfcube 2002-08-03 02:39:42.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/cerfcube 2004-01-27 21:27:40.000000000 +0100
@@ -474,7 +474,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/arm/def-configs/cerfpda linux-2.4/arch/arm/def-configs/cerfpda
--- linux-2.4.orig/arch/arm/def-configs/cerfpda 2002-08-03 02:39:42.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/cerfpda 2004-01-27 21:27:40.000000000 +0100
@@ -504,7 +504,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/arm/def-configs/cerfpod linux-2.4/arch/arm/def-configs/cerfpod
--- linux-2.4.orig/arch/arm/def-configs/cerfpod 2002-08-03 02:39:42.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/cerfpod 2004-01-27 21:27:40.000000000 +0100
@@ -475,7 +475,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/arm/def-configs/clps7500 linux-2.4/arch/arm/def-configs/clps7500
--- linux-2.4.orig/arch/arm/def-configs/clps7500 2002-08-03 02:39:42.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/clps7500 2004-01-27 21:27:40.000000000 +0100
@@ -298,7 +298,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/arm/def-configs/ebsa110 linux-2.4/arch/arm/def-configs/ebsa110
--- linux-2.4.orig/arch/arm/def-configs/ebsa110 2002-08-03 02:39:42.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/ebsa110 2004-01-27 21:27:40.000000000 +0100
@@ -387,7 +387,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/arm/def-configs/edb7211 linux-2.4/arch/arm/def-configs/edb7211
--- linux-2.4.orig/arch/arm/def-configs/edb7211 2001-10-25 22:53:44.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/edb7211 2004-01-27 21:27:40.000000000 +0100
@@ -225,7 +225,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/arm/def-configs/epxa10db linux-2.4/arch/arm/def-configs/epxa10db
--- linux-2.4.orig/arch/arm/def-configs/epxa10db 2003-08-25 13:44:39.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/epxa10db 2004-01-27 21:27:40.000000000 +0100
@@ -422,7 +422,6 @@
# ATA/ATAPI/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/arm/def-configs/epxa1db linux-2.4/arch/arm/def-configs/epxa1db
--- linux-2.4.orig/arch/arm/def-configs/epxa1db 2003-08-25 13:44:39.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/epxa1db 2004-01-27 21:27:40.000000000 +0100
@@ -404,7 +404,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/arm/def-configs/flexanet linux-2.4/arch/arm/def-configs/flexanet
--- linux-2.4.orig/arch/arm/def-configs/flexanet 2002-08-03 02:39:42.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/flexanet 2004-01-27 21:27:40.000000000 +0100
@@ -479,7 +479,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/arm/def-configs/footbridge linux-2.4/arch/arm/def-configs/footbridge
--- linux-2.4.orig/arch/arm/def-configs/footbridge 2003-06-13 16:51:29.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/footbridge 2004-01-27 21:27:40.000000000 +0100
@@ -437,7 +437,6 @@
CONFIG_IDEDMA_AUTO=y
# CONFIG_IDEDMA_IVB is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
#
# SCSI support
diff -ur linux-2.4.orig/arch/arm/def-configs/fortunet linux-2.4/arch/arm/def-configs/fortunet
--- linux-2.4.orig/arch/arm/def-configs/fortunet 2002-08-03 02:39:42.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/fortunet 2004-01-27 21:27:40.000000000 +0100
@@ -295,7 +295,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/arm/def-configs/freebird linux-2.4/arch/arm/def-configs/freebird
--- linux-2.4.orig/arch/arm/def-configs/freebird 2002-08-03 02:39:42.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/freebird 2004-01-27 21:27:40.000000000 +0100
@@ -384,7 +384,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
#
# SCSI support
diff -ur linux-2.4.orig/arch/arm/def-configs/freebird_new linux-2.4/arch/arm/def-configs/freebird_new
--- linux-2.4.orig/arch/arm/def-configs/freebird_new 2002-08-03 02:39:42.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/freebird_new 2004-01-27 21:27:40.000000000 +0100
@@ -398,7 +398,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
#
# SCSI support
diff -ur linux-2.4.orig/arch/arm/def-configs/frodo linux-2.4/arch/arm/def-configs/frodo
--- linux-2.4.orig/arch/arm/def-configs/frodo 2003-08-25 13:44:39.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/frodo 2004-01-27 21:27:40.000000000 +0100
@@ -462,7 +462,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/arm/def-configs/graphicsclient linux-2.4/arch/arm/def-configs/graphicsclient
--- linux-2.4.orig/arch/arm/def-configs/graphicsclient 2003-08-25 13:44:39.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/graphicsclient 2004-01-27 21:27:40.000000000 +0100
@@ -533,7 +533,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/arm/def-configs/graphicsmaster linux-2.4/arch/arm/def-configs/graphicsmaster
--- linux-2.4.orig/arch/arm/def-configs/graphicsmaster 2003-08-25 13:44:39.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/graphicsmaster 2004-01-27 21:27:40.000000000 +0100
@@ -535,7 +535,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/arm/def-configs/h3600 linux-2.4/arch/arm/def-configs/h3600
--- linux-2.4.orig/arch/arm/def-configs/h3600 2002-08-03 02:39:42.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/h3600 2004-01-27 21:27:40.000000000 +0100
@@ -482,7 +482,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/arm/def-configs/huw_webpanel linux-2.4/arch/arm/def-configs/huw_webpanel
--- linux-2.4.orig/arch/arm/def-configs/huw_webpanel 2001-08-12 20:13:59.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/huw_webpanel 2004-01-27 21:27:40.000000000 +0100
@@ -227,7 +227,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/arm/def-configs/integrator linux-2.4/arch/arm/def-configs/integrator
--- linux-2.4.orig/arch/arm/def-configs/integrator 2002-08-03 02:39:42.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/integrator 2004-01-27 21:27:40.000000000 +0100
@@ -410,7 +410,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/arm/def-configs/jornada720 linux-2.4/arch/arm/def-configs/jornada720
--- linux-2.4.orig/arch/arm/def-configs/jornada720 2002-08-03 02:39:42.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/jornada720 2004-01-27 21:27:40.000000000 +0100
@@ -482,7 +482,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/arm/def-configs/lart linux-2.4/arch/arm/def-configs/lart
--- linux-2.4.orig/arch/arm/def-configs/lart 2002-08-03 02:39:42.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/lart 2004-01-27 21:27:40.000000000 +0100
@@ -484,7 +484,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/arm/def-configs/lusl7200 linux-2.4/arch/arm/def-configs/lusl7200
--- linux-2.4.orig/arch/arm/def-configs/lusl7200 2003-08-25 13:44:39.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/lusl7200 2004-01-27 21:27:40.000000000 +0100
@@ -161,7 +161,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/arm/def-configs/nanoengine linux-2.4/arch/arm/def-configs/nanoengine
--- linux-2.4.orig/arch/arm/def-configs/nanoengine 2003-08-25 13:44:39.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/nanoengine 2004-01-27 21:27:40.000000000 +0100
@@ -413,7 +413,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/arm/def-configs/neponset linux-2.4/arch/arm/def-configs/neponset
--- linux-2.4.orig/arch/arm/def-configs/neponset 2002-08-03 02:39:42.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/neponset 2004-01-27 21:27:40.000000000 +0100
@@ -455,7 +455,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/arm/def-configs/omaha linux-2.4/arch/arm/def-configs/omaha
--- linux-2.4.orig/arch/arm/def-configs/omaha 2003-08-25 13:44:39.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/omaha 2004-01-27 21:27:40.000000000 +0100
@@ -358,7 +358,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/arm/def-configs/omnimeter linux-2.4/arch/arm/def-configs/omnimeter
--- linux-2.4.orig/arch/arm/def-configs/omnimeter 2001-08-12 20:13:59.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/omnimeter 2004-01-27 21:27:40.000000000 +0100
@@ -314,7 +314,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
#
# SCSI support
diff -ur linux-2.4.orig/arch/arm/def-configs/pangolin linux-2.4/arch/arm/def-configs/pangolin
--- linux-2.4.orig/arch/arm/def-configs/pangolin 2002-08-03 02:39:42.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/pangolin 2004-01-27 21:27:40.000000000 +0100
@@ -434,7 +434,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
#
# SCSI support
diff -ur linux-2.4.orig/arch/arm/def-configs/pfs168_mqtft linux-2.4/arch/arm/def-configs/pfs168_mqtft
--- linux-2.4.orig/arch/arm/def-configs/pfs168_mqtft 2002-08-03 02:39:42.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/pfs168_mqtft 2004-01-27 21:27:40.000000000 +0100
@@ -458,7 +458,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
#
# SCSI support
diff -ur linux-2.4.orig/arch/arm/def-configs/pfs168_mqvga linux-2.4/arch/arm/def-configs/pfs168_mqvga
--- linux-2.4.orig/arch/arm/def-configs/pfs168_mqvga 2002-08-03 02:39:42.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/pfs168_mqvga 2004-01-27 21:27:40.000000000 +0100
@@ -458,7 +458,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
#
# SCSI support
diff -ur linux-2.4.orig/arch/arm/def-configs/pfs168_sastn linux-2.4/arch/arm/def-configs/pfs168_sastn
--- linux-2.4.orig/arch/arm/def-configs/pfs168_sastn 2002-08-03 02:39:42.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/pfs168_sastn 2004-01-27 21:27:40.000000000 +0100
@@ -459,7 +459,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
#
# SCSI support
diff -ur linux-2.4.orig/arch/arm/def-configs/pfs168_satft linux-2.4/arch/arm/def-configs/pfs168_satft
--- linux-2.4.orig/arch/arm/def-configs/pfs168_satft 2002-08-03 02:39:42.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/pfs168_satft 2004-01-27 21:27:40.000000000 +0100
@@ -458,7 +458,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
#
# SCSI support
diff -ur linux-2.4.orig/arch/arm/def-configs/pleb linux-2.4/arch/arm/def-configs/pleb
--- linux-2.4.orig/arch/arm/def-configs/pleb 2002-08-03 02:39:42.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/pleb 2004-01-27 21:27:40.000000000 +0100
@@ -331,7 +331,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/arm/def-configs/riscstation linux-2.4/arch/arm/def-configs/riscstation
--- linux-2.4.orig/arch/arm/def-configs/riscstation 2003-08-25 13:44:39.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/riscstation 2004-01-27 21:27:40.000000000 +0100
@@ -372,7 +372,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/arm/def-configs/rpc linux-2.4/arch/arm/def-configs/rpc
--- linux-2.4.orig/arch/arm/def-configs/rpc 2002-08-03 02:39:42.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/rpc 2004-01-27 21:27:40.000000000 +0100
@@ -412,7 +412,6 @@
CONFIG_IDEDMA_AUTO=y
# CONFIG_IDEDMA_IVB is not set
# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
#
# SCSI support
diff -ur linux-2.4.orig/arch/arm/def-configs/shannon linux-2.4/arch/arm/def-configs/shannon
--- linux-2.4.orig/arch/arm/def-configs/shannon 2002-08-03 02:39:42.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/shannon 2004-01-27 21:27:40.000000000 +0100
@@ -387,7 +387,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_ATARAID is not set
#
diff -ur linux-2.4.orig/arch/arm/def-configs/shark linux-2.4/arch/arm/def-configs/shark
--- linux-2.4.orig/arch/arm/def-configs/shark 2002-08-03 02:39:42.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/shark 2004-01-27 21:27:40.000000000 +0100
@@ -391,7 +391,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/arm/def-configs/system3 linux-2.4/arch/arm/def-configs/system3
--- linux-2.4.orig/arch/arm/def-configs/system3 2002-08-03 02:39:42.000000000 +0200
+++ linux-2.4/arch/arm/def-configs/system3 2004-01-27 21:27:40.000000000 +0100
@@ -496,7 +496,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/arm/defconfig linux-2.4/arch/arm/defconfig
--- linux-2.4.orig/arch/arm/defconfig 2001-05-20 02:43:05.000000000 +0200
+++ linux-2.4/arch/arm/defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -303,7 +303,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/cris/config.in linux-2.4/arch/cris/config.in
--- linux-2.4.orig/arch/cris/config.in 2003-11-28 19:26:19.000000000 +0100
+++ linux-2.4/arch/cris/config.in 2004-01-27 21:27:40.000000000 +0100
@@ -184,7 +184,6 @@
if [ "$CONFIG_IDE" != "n" ]; then
source drivers/ide/Config.in
else
- define_bool CONFIG_BLK_DEV_IDE_MODES n
define_bool CONFIG_BLK_DEV_HD n
fi
endmenu
diff -ur linux-2.4.orig/arch/cris/defconfig linux-2.4/arch/cris/defconfig
--- linux-2.4.orig/arch/cris/defconfig 2003-08-25 13:44:39.000000000 +0200
+++ linux-2.4/arch/cris/defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -282,7 +282,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
#
# SCSI support
diff -ur linux-2.4.orig/arch/i386/config.in linux-2.4/arch/i386/config.in
--- linux-2.4.orig/arch/i386/config.in 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/i386/config.in 2004-01-27 21:27:39.000000000 +0100
@@ -371,7 +371,6 @@
if [ "$CONFIG_IDE" != "n" ]; then
source drivers/ide/Config.in
else
- define_bool CONFIG_BLK_DEV_IDE_MODES n
define_bool CONFIG_BLK_DEV_HD n
fi
endmenu
diff -ur linux-2.4.orig/arch/i386/defconfig linux-2.4/arch/i386/defconfig
--- linux-2.4.orig/arch/i386/defconfig 2003-11-28 19:26:19.000000000 +0100
+++ linux-2.4/arch/i386/defconfig 2004-01-27 21:27:39.000000000 +0100
@@ -288,7 +288,6 @@
CONFIG_IDEDMA_AUTO=y
# CONFIG_IDEDMA_IVB is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/ia64/config.in linux-2.4/arch/ia64/config.in
--- linux-2.4.orig/arch/ia64/config.in 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ia64/config.in 2004-01-27 21:27:40.000000000 +0100
@@ -171,7 +171,6 @@
if [ "$CONFIG_IDE" != "n" ]; then
source drivers/ide/Config.in
else
- define_bool CONFIG_BLK_DEV_IDE_MODES n
define_bool CONFIG_BLK_DEV_HD n
fi
endmenu
diff -ur linux-2.4.orig/arch/ia64/configs/dig linux-2.4/arch/ia64/configs/dig
--- linux-2.4.orig/arch/ia64/configs/dig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ia64/configs/dig 2004-01-27 21:27:40.000000000 +0100
@@ -290,7 +290,6 @@
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_IDEDMA_IVB is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/ia64/configs/generic linux-2.4/arch/ia64/configs/generic
--- linux-2.4.orig/arch/ia64/configs/generic 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ia64/configs/generic 2004-01-27 21:27:40.000000000 +0100
@@ -291,7 +291,6 @@
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_IDEDMA_IVB is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/ia64/configs/numa linux-2.4/arch/ia64/configs/numa
--- linux-2.4.orig/arch/ia64/configs/numa 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ia64/configs/numa 2004-01-27 21:27:40.000000000 +0100
@@ -293,7 +293,6 @@
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_IDEDMA_IVB is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/ia64/configs/zx1 linux-2.4/arch/ia64/configs/zx1
--- linux-2.4.orig/arch/ia64/configs/zx1 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ia64/configs/zx1 2004-01-27 21:27:40.000000000 +0100
@@ -291,7 +291,6 @@
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_IDEDMA_IVB is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/ia64/defconfig linux-2.4/arch/ia64/defconfig
--- linux-2.4.orig/arch/ia64/defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ia64/defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -291,7 +291,6 @@
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_IDEDMA_IVB is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/m68k/config.in linux-2.4/arch/m68k/config.in
--- linux-2.4.orig/arch/m68k/config.in 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/m68k/config.in 2004-01-27 21:27:40.000000000 +0100
@@ -185,7 +185,6 @@
if [ "$CONFIG_IDE" != "n" ]; then
source drivers/ide/Config.in
else
- define_bool CONFIG_BLK_DEV_IDE_MODES n
define_bool CONFIG_BLK_DEV_HD n
fi
endmenu
diff -ur linux-2.4.orig/arch/m68k/defconfig linux-2.4/arch/m68k/defconfig
--- linux-2.4.orig/arch/m68k/defconfig 2003-11-28 19:26:19.000000000 +0100
+++ linux-2.4/arch/m68k/defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -124,7 +124,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/mips/config-shared.in linux-2.4/arch/mips/config-shared.in
--- linux-2.4.orig/arch/mips/config-shared.in 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/config-shared.in 2004-01-27 21:27:39.000000000 +0100
@@ -995,7 +995,6 @@
if [ "$CONFIG_IDE" != "n" ]; then
source drivers/ide/Config.in
else
- define_bool CONFIG_BLK_DEV_IDE_MODES n
define_bool CONFIG_BLK_DEV_HD n
fi
endmenu
diff -ur linux-2.4.orig/arch/mips/defconfig linux-2.4/arch/mips/defconfig
--- linux-2.4.orig/arch/mips/defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -267,7 +267,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/mips/defconfig-atlas linux-2.4/arch/mips/defconfig-atlas
--- linux-2.4.orig/arch/mips/defconfig-atlas 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-atlas 2004-01-27 21:27:40.000000000 +0100
@@ -265,7 +265,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/mips/defconfig-bosporus linux-2.4/arch/mips/defconfig-bosporus
--- linux-2.4.orig/arch/mips/defconfig-bosporus 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-bosporus 2004-01-27 21:27:40.000000000 +0100
@@ -401,7 +401,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/mips/defconfig-capcella linux-2.4/arch/mips/defconfig-capcella
--- linux-2.4.orig/arch/mips/defconfig-capcella 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-capcella 2004-01-27 21:27:40.000000000 +0100
@@ -291,7 +291,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/mips/defconfig-cobalt linux-2.4/arch/mips/defconfig-cobalt
--- linux-2.4.orig/arch/mips/defconfig-cobalt 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-cobalt 2004-01-27 21:27:40.000000000 +0100
@@ -320,7 +320,6 @@
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_IDEDMA_IVB is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/mips/defconfig-csb250 linux-2.4/arch/mips/defconfig-csb250
--- linux-2.4.orig/arch/mips/defconfig-csb250 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-csb250 2004-01-27 21:27:40.000000000 +0100
@@ -367,7 +367,6 @@
CONFIG_IDEDMA_AUTO=y
# CONFIG_IDEDMA_IVB is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/mips/defconfig-db1000 linux-2.4/arch/mips/defconfig-db1000
--- linux-2.4.orig/arch/mips/defconfig-db1000 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-db1000 2004-01-27 21:27:40.000000000 +0100
@@ -403,7 +403,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/mips/defconfig-db1100 linux-2.4/arch/mips/defconfig-db1100
--- linux-2.4.orig/arch/mips/defconfig-db1100 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-db1100 2004-01-27 21:27:40.000000000 +0100
@@ -402,7 +402,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/mips/defconfig-db1500 linux-2.4/arch/mips/defconfig-db1500
--- linux-2.4.orig/arch/mips/defconfig-db1500 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-db1500 2004-01-27 21:27:40.000000000 +0100
@@ -366,7 +366,6 @@
CONFIG_IDEDMA_AUTO=y
# CONFIG_IDEDMA_IVB is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/mips/defconfig-ddb5476 linux-2.4/arch/mips/defconfig-ddb5476
--- linux-2.4.orig/arch/mips/defconfig-ddb5476 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-ddb5476 2004-01-27 21:27:40.000000000 +0100
@@ -325,7 +325,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/mips/defconfig-ddb5477 linux-2.4/arch/mips/defconfig-ddb5477
--- linux-2.4.orig/arch/mips/defconfig-ddb5477 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-ddb5477 2004-01-27 21:27:40.000000000 +0100
@@ -258,7 +258,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/mips/defconfig-decstation linux-2.4/arch/mips/defconfig-decstation
--- linux-2.4.orig/arch/mips/defconfig-decstation 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-decstation 2004-01-27 21:27:40.000000000 +0100
@@ -254,7 +254,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/mips/defconfig-e55 linux-2.4/arch/mips/defconfig-e55
--- linux-2.4.orig/arch/mips/defconfig-e55 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-e55 2004-01-27 21:27:40.000000000 +0100
@@ -284,7 +284,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/mips/defconfig-eagle linux-2.4/arch/mips/defconfig-eagle
--- linux-2.4.orig/arch/mips/defconfig-eagle 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-eagle 2004-01-27 21:27:40.000000000 +0100
@@ -385,7 +385,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/mips/defconfig-ev64120 linux-2.4/arch/mips/defconfig-ev64120
--- linux-2.4.orig/arch/mips/defconfig-ev64120 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-ev64120 2004-01-27 21:27:40.000000000 +0100
@@ -260,7 +260,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/mips/defconfig-ev96100 linux-2.4/arch/mips/defconfig-ev96100
--- linux-2.4.orig/arch/mips/defconfig-ev96100 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-ev96100 2004-01-27 21:27:40.000000000 +0100
@@ -263,7 +263,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/mips/defconfig-hp-lj linux-2.4/arch/mips/defconfig-hp-lj
--- linux-2.4.orig/arch/mips/defconfig-hp-lj 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-hp-lj 2004-01-27 21:27:40.000000000 +0100
@@ -402,7 +402,6 @@
CONFIG_IDEDMA_AUTO=y
# CONFIG_IDEDMA_IVB is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/mips/defconfig-hydrogen3 linux-2.4/arch/mips/defconfig-hydrogen3
--- linux-2.4.orig/arch/mips/defconfig-hydrogen3 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-hydrogen3 2004-01-27 21:27:40.000000000 +0100
@@ -400,7 +400,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/mips/defconfig-ip22 linux-2.4/arch/mips/defconfig-ip22
--- linux-2.4.orig/arch/mips/defconfig-ip22 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-ip22 2004-01-27 21:27:40.000000000 +0100
@@ -267,7 +267,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/mips/defconfig-it8172 linux-2.4/arch/mips/defconfig-it8172
--- linux-2.4.orig/arch/mips/defconfig-it8172 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-it8172 2004-01-27 21:27:40.000000000 +0100
@@ -404,7 +404,6 @@
CONFIG_IDEDMA_AUTO=y
# CONFIG_IDEDMA_IVB is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/mips/defconfig-ivr linux-2.4/arch/mips/defconfig-ivr
--- linux-2.4.orig/arch/mips/defconfig-ivr 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-ivr 2004-01-27 21:27:40.000000000 +0100
@@ -327,7 +327,6 @@
CONFIG_IDEDMA_AUTO=y
# CONFIG_IDEDMA_IVB is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/mips/defconfig-jmr3927 linux-2.4/arch/mips/defconfig-jmr3927
--- linux-2.4.orig/arch/mips/defconfig-jmr3927 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-jmr3927 2004-01-27 21:27:40.000000000 +0100
@@ -257,7 +257,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/mips/defconfig-lasat linux-2.4/arch/mips/defconfig-lasat
--- linux-2.4.orig/arch/mips/defconfig-lasat 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-lasat 2004-01-27 21:27:40.000000000 +0100
@@ -399,7 +399,6 @@
CONFIG_IDEDMA_AUTO=y
# CONFIG_IDEDMA_IVB is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/mips/defconfig-malta linux-2.4/arch/mips/defconfig-malta
--- linux-2.4.orig/arch/mips/defconfig-malta 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-malta 2004-01-27 21:27:40.000000000 +0100
@@ -267,7 +267,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/mips/defconfig-mirage linux-2.4/arch/mips/defconfig-mirage
--- linux-2.4.orig/arch/mips/defconfig-mirage 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-mirage 2004-01-27 21:27:40.000000000 +0100
@@ -290,7 +290,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/mips/defconfig-mpc30x linux-2.4/arch/mips/defconfig-mpc30x
--- linux-2.4.orig/arch/mips/defconfig-mpc30x 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-mpc30x 2004-01-27 21:27:40.000000000 +0100
@@ -261,7 +261,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/mips/defconfig-mtx-1 linux-2.4/arch/mips/defconfig-mtx-1
--- linux-2.4.orig/arch/mips/defconfig-mtx-1 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-mtx-1 2004-01-27 21:27:40.000000000 +0100
@@ -425,7 +425,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/mips/defconfig-nino linux-2.4/arch/mips/defconfig-nino
--- linux-2.4.orig/arch/mips/defconfig-nino 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-nino 2004-01-27 21:27:40.000000000 +0100
@@ -258,7 +258,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/mips/defconfig-ocelot linux-2.4/arch/mips/defconfig-ocelot
--- linux-2.4.orig/arch/mips/defconfig-ocelot 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-ocelot 2004-01-27 21:27:40.000000000 +0100
@@ -336,7 +336,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/mips/defconfig-osprey linux-2.4/arch/mips/defconfig-osprey
--- linux-2.4.orig/arch/mips/defconfig-osprey 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-osprey 2004-01-27 21:27:40.000000000 +0100
@@ -257,7 +257,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/mips/defconfig-pb1000 linux-2.4/arch/mips/defconfig-pb1000
--- linux-2.4.orig/arch/mips/defconfig-pb1000 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-pb1000 2004-01-27 21:27:40.000000000 +0100
@@ -385,7 +385,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/mips/defconfig-pb1100 linux-2.4/arch/mips/defconfig-pb1100
--- linux-2.4.orig/arch/mips/defconfig-pb1100 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-pb1100 2004-01-27 21:27:39.000000000 +0100
@@ -386,7 +386,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/mips/defconfig-pb1500 linux-2.4/arch/mips/defconfig-pb1500
--- linux-2.4.orig/arch/mips/defconfig-pb1500 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-pb1500 2004-01-27 21:27:39.000000000 +0100
@@ -439,7 +439,6 @@
CONFIG_IDEDMA_AUTO=y
# CONFIG_IDEDMA_IVB is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/mips/defconfig-pb1550 linux-2.4/arch/mips/defconfig-pb1550
--- linux-2.4.orig/arch/mips/defconfig-pb1550 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-pb1550 2004-01-27 21:29:51.000000000 +0100
@@ -350,7 +350,6 @@
# CONFIG_IDEDMA_IVB is not set
# CONFIG_DMA_NONPCI is not set
CONFIG_BLK_DEV_PDC202XX=y
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/mips/defconfig-rbtx4927 linux-2.4/arch/mips/defconfig-rbtx4927
--- linux-2.4.orig/arch/mips/defconfig-rbtx4927 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-rbtx4927 2004-01-27 21:27:40.000000000 +0100
@@ -255,7 +255,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/mips/defconfig-rm200 linux-2.4/arch/mips/defconfig-rm200
--- linux-2.4.orig/arch/mips/defconfig-rm200 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-rm200 2004-01-27 21:27:39.000000000 +0100
@@ -259,7 +259,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/mips/defconfig-sb1250-swarm linux-2.4/arch/mips/defconfig-sb1250-swarm
--- linux-2.4.orig/arch/mips/defconfig-sb1250-swarm 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-sb1250-swarm 2004-01-27 21:27:39.000000000 +0100
@@ -315,7 +315,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/mips/defconfig-sead linux-2.4/arch/mips/defconfig-sead
--- linux-2.4.orig/arch/mips/defconfig-sead 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-sead 2004-01-27 21:27:39.000000000 +0100
@@ -200,7 +200,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/mips/defconfig-tb0226 linux-2.4/arch/mips/defconfig-tb0226
--- linux-2.4.orig/arch/mips/defconfig-tb0226 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-tb0226 2004-01-27 21:27:39.000000000 +0100
@@ -260,7 +260,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/mips/defconfig-tb0229 linux-2.4/arch/mips/defconfig-tb0229
--- linux-2.4.orig/arch/mips/defconfig-tb0229 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-tb0229 2004-01-27 21:27:39.000000000 +0100
@@ -262,7 +262,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/mips/defconfig-ti1500 linux-2.4/arch/mips/defconfig-ti1500
--- linux-2.4.orig/arch/mips/defconfig-ti1500 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-ti1500 2004-01-27 21:27:39.000000000 +0100
@@ -400,7 +400,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/mips/defconfig-workpad linux-2.4/arch/mips/defconfig-workpad
--- linux-2.4.orig/arch/mips/defconfig-workpad 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-workpad 2004-01-27 21:27:39.000000000 +0100
@@ -284,7 +284,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/mips/defconfig-xxs1500 linux-2.4/arch/mips/defconfig-xxs1500
--- linux-2.4.orig/arch/mips/defconfig-xxs1500 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-xxs1500 2004-01-27 21:27:39.000000000 +0100
@@ -437,7 +437,6 @@
CONFIG_IDEDMA_AUTO=y
# CONFIG_IDEDMA_IVB is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/mips/defconfig-yosemite linux-2.4/arch/mips/defconfig-yosemite
--- linux-2.4.orig/arch/mips/defconfig-yosemite 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips/defconfig-yosemite 2004-01-27 21:27:40.000000000 +0100
@@ -256,7 +256,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/mips64/defconfig linux-2.4/arch/mips64/defconfig
--- linux-2.4.orig/arch/mips64/defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips64/defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -247,7 +247,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/mips64/defconfig-atlas linux-2.4/arch/mips64/defconfig-atlas
--- linux-2.4.orig/arch/mips64/defconfig-atlas 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips64/defconfig-atlas 2004-01-27 21:27:40.000000000 +0100
@@ -262,7 +262,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/mips64/defconfig-decstation linux-2.4/arch/mips64/defconfig-decstation
--- linux-2.4.orig/arch/mips64/defconfig-decstation 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips64/defconfig-decstation 2004-01-27 21:27:40.000000000 +0100
@@ -255,7 +255,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/mips64/defconfig-ip22 linux-2.4/arch/mips64/defconfig-ip22
--- linux-2.4.orig/arch/mips64/defconfig-ip22 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips64/defconfig-ip22 2004-01-27 21:27:40.000000000 +0100
@@ -267,7 +267,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/mips64/defconfig-ip27 linux-2.4/arch/mips64/defconfig-ip27
--- linux-2.4.orig/arch/mips64/defconfig-ip27 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips64/defconfig-ip27 2004-01-27 21:27:40.000000000 +0100
@@ -247,7 +247,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/mips64/defconfig-jaguar linux-2.4/arch/mips64/defconfig-jaguar
--- linux-2.4.orig/arch/mips64/defconfig-jaguar 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips64/defconfig-jaguar 2004-01-27 21:27:40.000000000 +0100
@@ -256,7 +256,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/mips64/defconfig-malta linux-2.4/arch/mips64/defconfig-malta
--- linux-2.4.orig/arch/mips64/defconfig-malta 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips64/defconfig-malta 2004-01-27 21:27:40.000000000 +0100
@@ -265,7 +265,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/mips64/defconfig-ocelotc linux-2.4/arch/mips64/defconfig-ocelotc
--- linux-2.4.orig/arch/mips64/defconfig-ocelotc 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips64/defconfig-ocelotc 2004-01-27 21:27:40.000000000 +0100
@@ -261,7 +261,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/mips64/defconfig-sb1250-swarm linux-2.4/arch/mips64/defconfig-sb1250-swarm
--- linux-2.4.orig/arch/mips64/defconfig-sb1250-swarm 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips64/defconfig-sb1250-swarm 2004-01-27 21:27:40.000000000 +0100
@@ -284,7 +284,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/mips64/defconfig-sead linux-2.4/arch/mips64/defconfig-sead
--- linux-2.4.orig/arch/mips64/defconfig-sead 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/mips64/defconfig-sead 2004-01-27 21:27:40.000000000 +0100
@@ -198,7 +198,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/parisc/config.in linux-2.4/arch/parisc/config.in
--- linux-2.4.orig/arch/parisc/config.in 2003-11-28 19:26:19.000000000 +0100
+++ linux-2.4/arch/parisc/config.in 2004-01-27 21:27:40.000000000 +0100
@@ -116,7 +116,6 @@
if [ "$CONFIG_IDE" != "n" ]; then
source drivers/ide/Config.in
else
- define_bool CONFIG_BLK_DEV_IDE_MODES n
define_bool CONFIG_BLK_DEV_HD n
fi
endmenu
diff -ur linux-2.4.orig/arch/parisc/defconfig linux-2.4/arch/parisc/defconfig
--- linux-2.4.orig/arch/parisc/defconfig 2003-06-13 16:51:31.000000000 +0200
+++ linux-2.4/arch/parisc/defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -245,7 +245,6 @@
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_IDEDMA_IVB is not set
# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/ppc/config.in linux-2.4/arch/ppc/config.in
--- linux-2.4.orig/arch/ppc/config.in 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc/config.in 2004-01-27 21:27:40.000000000 +0100
@@ -445,7 +445,6 @@
if [ "$CONFIG_IDE" != "n" ]; then
source drivers/ide/Config.in
else
- define_bool CONFIG_BLK_DEV_IDE_MODES n
define_bool CONFIG_BLK_DEV_HD n
fi
endmenu
diff -ur linux-2.4.orig/arch/ppc/configs/IVMS8_defconfig linux-2.4/arch/ppc/configs/IVMS8_defconfig
--- linux-2.4.orig/arch/ppc/configs/IVMS8_defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc/configs/IVMS8_defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -215,7 +215,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/ppc/configs/SM850_defconfig linux-2.4/arch/ppc/configs/SM850_defconfig
--- linux-2.4.orig/arch/ppc/configs/SM850_defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc/configs/SM850_defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -182,7 +182,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/ppc/configs/SPD823TS_defconfig linux-2.4/arch/ppc/configs/SPD823TS_defconfig
--- linux-2.4.orig/arch/ppc/configs/SPD823TS_defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc/configs/SPD823TS_defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -181,7 +181,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/ppc/configs/TQM823L_defconfig linux-2.4/arch/ppc/configs/TQM823L_defconfig
--- linux-2.4.orig/arch/ppc/configs/TQM823L_defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc/configs/TQM823L_defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -182,7 +182,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/ppc/configs/TQM850L_defconfig linux-2.4/arch/ppc/configs/TQM850L_defconfig
--- linux-2.4.orig/arch/ppc/configs/TQM850L_defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc/configs/TQM850L_defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -182,7 +182,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/ppc/configs/TQM860L_defconfig linux-2.4/arch/ppc/configs/TQM860L_defconfig
--- linux-2.4.orig/arch/ppc/configs/TQM860L_defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc/configs/TQM860L_defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -216,7 +216,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/ppc/configs/apus_defconfig linux-2.4/arch/ppc/configs/apus_defconfig
--- linux-2.4.orig/arch/ppc/configs/apus_defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc/configs/apus_defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -291,7 +291,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/ppc/configs/briq_defconfig linux-2.4/arch/ppc/configs/briq_defconfig
--- linux-2.4.orig/arch/ppc/configs/briq_defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc/configs/briq_defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -301,7 +301,6 @@
CONFIG_IDEDMA_AUTO=y
# CONFIG_IDEDMA_IVB is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/ppc/configs/bseip_defconfig linux-2.4/arch/ppc/configs/bseip_defconfig
--- linux-2.4.orig/arch/ppc/configs/bseip_defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc/configs/bseip_defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -181,7 +181,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/ppc/configs/common_defconfig linux-2.4/arch/ppc/configs/common_defconfig
--- linux-2.4.orig/arch/ppc/configs/common_defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc/configs/common_defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -309,7 +309,6 @@
CONFIG_IDEDMA_AUTO=y
# CONFIG_IDEDMA_IVB is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/ppc/configs/cpci405_defconfig linux-2.4/arch/ppc/configs/cpci405_defconfig
--- linux-2.4.orig/arch/ppc/configs/cpci405_defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc/configs/cpci405_defconfig 2004-01-27 21:29:56.000000000 +0100
@@ -259,7 +259,6 @@
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_IDEDMA_IVB is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/ppc/configs/ebony_defconfig linux-2.4/arch/ppc/configs/ebony_defconfig
--- linux-2.4.orig/arch/ppc/configs/ebony_defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc/configs/ebony_defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -183,7 +183,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/ppc/configs/est8260_defconfig linux-2.4/arch/ppc/configs/est8260_defconfig
--- linux-2.4.orig/arch/ppc/configs/est8260_defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc/configs/est8260_defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -164,7 +164,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/ppc/configs/gemini_defconfig linux-2.4/arch/ppc/configs/gemini_defconfig
--- linux-2.4.orig/arch/ppc/configs/gemini_defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc/configs/gemini_defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -183,7 +183,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/ppc/configs/ibmchrp_defconfig linux-2.4/arch/ppc/configs/ibmchrp_defconfig
--- linux-2.4.orig/arch/ppc/configs/ibmchrp_defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc/configs/ibmchrp_defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -227,7 +227,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/ppc/configs/mbx_defconfig linux-2.4/arch/ppc/configs/mbx_defconfig
--- linux-2.4.orig/arch/ppc/configs/mbx_defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc/configs/mbx_defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -178,7 +178,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/ppc/configs/oak_defconfig linux-2.4/arch/ppc/configs/oak_defconfig
--- linux-2.4.orig/arch/ppc/configs/oak_defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc/configs/oak_defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -165,7 +165,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/ppc/configs/ocotea_defconfig linux-2.4/arch/ppc/configs/ocotea_defconfig
--- linux-2.4.orig/arch/ppc/configs/ocotea_defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc/configs/ocotea_defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -184,7 +184,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/ppc/configs/pal4_defconfig linux-2.4/arch/ppc/configs/pal4_defconfig
--- linux-2.4.orig/arch/ppc/configs/pal4_defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc/configs/pal4_defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -226,7 +226,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/ppc/configs/pmac_defconfig linux-2.4/arch/ppc/configs/pmac_defconfig
--- linux-2.4.orig/arch/ppc/configs/pmac_defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc/configs/pmac_defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -313,7 +313,6 @@
# CONFIG_IDEDMA_IVB is not set
# CONFIG_DMA_NONPCI is not set
CONFIG_BLK_DEV_PDC202XX=y
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/ppc/configs/power3_defconfig linux-2.4/arch/ppc/configs/power3_defconfig
--- linux-2.4.orig/arch/ppc/configs/power3_defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc/configs/power3_defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -181,7 +181,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/ppc/configs/pplus_defconfig linux-2.4/arch/ppc/configs/pplus_defconfig
--- linux-2.4.orig/arch/ppc/configs/pplus_defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc/configs/pplus_defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -300,7 +300,6 @@
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_IDEDMA_IVB is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/ppc/configs/prpmc750_defconfig linux-2.4/arch/ppc/configs/prpmc750_defconfig
--- linux-2.4.orig/arch/ppc/configs/prpmc750_defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc/configs/prpmc750_defconfig 2004-01-27 21:30:01.000000000 +0100
@@ -245,7 +245,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/ppc/configs/rpxcllf_defconfig linux-2.4/arch/ppc/configs/rpxcllf_defconfig
--- linux-2.4.orig/arch/ppc/configs/rpxcllf_defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc/configs/rpxcllf_defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -191,7 +191,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/ppc/configs/rpxlite_defconfig linux-2.4/arch/ppc/configs/rpxlite_defconfig
--- linux-2.4.orig/arch/ppc/configs/rpxlite_defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc/configs/rpxlite_defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -191,7 +191,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/ppc/configs/sandpoint_defconfig linux-2.4/arch/ppc/configs/sandpoint_defconfig
--- linux-2.4.orig/arch/ppc/configs/sandpoint_defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc/configs/sandpoint_defconfig 2004-01-27 21:30:06.000000000 +0100
@@ -262,7 +262,6 @@
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_IDEDMA_IVB is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/ppc/configs/spruce_defconfig linux-2.4/arch/ppc/configs/spruce_defconfig
--- linux-2.4.orig/arch/ppc/configs/spruce_defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc/configs/spruce_defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -173,7 +173,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/ppc/configs/walnut_defconfig linux-2.4/arch/ppc/configs/walnut_defconfig
--- linux-2.4.orig/arch/ppc/configs/walnut_defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc/configs/walnut_defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -173,7 +173,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/ppc/defconfig linux-2.4/arch/ppc/defconfig
--- linux-2.4.orig/arch/ppc/defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc/defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -309,7 +309,6 @@
CONFIG_IDEDMA_AUTO=y
# CONFIG_IDEDMA_IVB is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/ppc64/config.in linux-2.4/arch/ppc64/config.in
--- linux-2.4.orig/arch/ppc64/config.in 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc64/config.in 2004-01-27 21:27:39.000000000 +0100
@@ -122,7 +122,6 @@
if [ "$CONFIG_IDE" != "n" ]; then
source drivers/ide/Config.in
else
- define_bool CONFIG_BLK_DEV_IDE_MODES n
define_bool CONFIG_BLK_DEV_HD n
fi
endmenu
diff -ur linux-2.4.orig/arch/ppc64/configs/iSeries_devfs_defconfig linux-2.4/arch/ppc64/configs/iSeries_devfs_defconfig
--- linux-2.4.orig/arch/ppc64/configs/iSeries_devfs_defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc64/configs/iSeries_devfs_defconfig 2004-01-27 21:29:46.000000000 +0100
@@ -160,7 +160,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/ppc64/configs/iSeries_nodevfs_ideemul_defconfig linux-2.4/arch/ppc64/configs/iSeries_nodevfs_ideemul_defconfig
--- linux-2.4.orig/arch/ppc64/configs/iSeries_nodevfs_ideemul_defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc64/configs/iSeries_nodevfs_ideemul_defconfig 2004-01-27 21:27:39.000000000 +0100
@@ -168,7 +168,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/ppc64/configs/pSeries_defconfig linux-2.4/arch/ppc64/configs/pSeries_defconfig
--- linux-2.4.orig/arch/ppc64/configs/pSeries_defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc64/configs/pSeries_defconfig 2004-01-27 21:27:39.000000000 +0100
@@ -235,7 +235,6 @@
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_IDEDMA_IVB is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/ppc64/defconfig linux-2.4/arch/ppc64/defconfig
--- linux-2.4.orig/arch/ppc64/defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/ppc64/defconfig 2004-01-27 21:27:39.000000000 +0100
@@ -235,7 +235,6 @@
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_IDEDMA_IVB is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/arch/sh/config.in linux-2.4/arch/sh/config.in
--- linux-2.4.orig/arch/sh/config.in 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/sh/config.in 2004-01-27 21:27:40.000000000 +0100
@@ -309,7 +309,6 @@
if [ "$CONFIG_IDE" != "n" ]; then
source drivers/ide/Config.in
else
- define_bool CONFIG_BLK_DEV_IDE_MODES n
define_bool CONFIG_BLK_DEV_HD n
fi
endmenu
diff -ur linux-2.4.orig/arch/sh/defconfig linux-2.4/arch/sh/defconfig
--- linux-2.4.orig/arch/sh/defconfig 2001-10-15 22:36:48.000000000 +0200
+++ linux-2.4/arch/sh/defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -121,7 +121,6 @@
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
#
# SCSI support
diff -ur linux-2.4.orig/arch/sh64/config.in linux-2.4/arch/sh64/config.in
--- linux-2.4.orig/arch/sh64/config.in 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/sh64/config.in 2004-01-27 21:27:39.000000000 +0100
@@ -177,7 +177,6 @@
if [ "$CONFIG_IDE" != "n" ]; then
source drivers/ide/Config.in
else
- define_bool CONFIG_BLK_DEV_IDE_MODES n
define_bool CONFIG_BLK_DEV_HD n
fi
endmenu
diff -ur linux-2.4.orig/arch/sh64/defconfig linux-2.4/arch/sh64/defconfig
--- linux-2.4.orig/arch/sh64/defconfig 2003-11-28 19:26:19.000000000 +0100
+++ linux-2.4/arch/sh64/defconfig 2004-01-27 21:27:39.000000000 +0100
@@ -171,7 +171,6 @@
# ATA/IDE/MFM/RLL support
#
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/sparc/config.in linux-2.4/arch/sparc/config.in
--- linux-2.4.orig/arch/sparc/config.in 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/sparc/config.in 2004-01-27 21:27:39.000000000 +0100
@@ -127,14 +127,12 @@
if [ "$CONFIG_IDE" != "n" ]; then
source drivers/ide/Config.in
else
- define_bool CONFIG_BLK_DEV_IDE_MODES n
define_bool CONFIG_BLK_DEV_HD n
fi
endmenu
else
define_bool CONFIG_IDE n
- define_bool CONFIG_BLK_DEV_IDE_MODES n
define_bool CONFIG_BLK_DEV_HD n
fi
diff -ur linux-2.4.orig/arch/sparc/defconfig linux-2.4/arch/sparc/defconfig
--- linux-2.4.orig/arch/sparc/defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/sparc/defconfig 2004-01-27 21:27:39.000000000 +0100
@@ -201,7 +201,6 @@
#
CONFIG_NET_PKTGEN=m
# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
# CONFIG_BLK_DEV_HD is not set
#
diff -ur linux-2.4.orig/arch/sparc64/config.in linux-2.4/arch/sparc64/config.in
--- linux-2.4.orig/arch/sparc64/config.in 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/sparc64/config.in 2004-01-27 21:27:40.000000000 +0100
@@ -132,7 +132,6 @@
if [ "$CONFIG_IDE" != "n" ]; then
source drivers/ide/Config.in
else
- define_bool CONFIG_BLK_DEV_IDE_MODES n
define_bool CONFIG_BLK_DEV_HD n
fi
endmenu
diff -ur linux-2.4.orig/arch/sparc64/defconfig linux-2.4/arch/sparc64/defconfig
--- linux-2.4.orig/arch/sparc64/defconfig 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/arch/sparc64/defconfig 2004-01-27 21:27:40.000000000 +0100
@@ -450,7 +450,6 @@
# CONFIG_IDEDMA_IVB is not set
# CONFIG_DMA_NONPCI is not set
CONFIG_BLK_DEV_PDC202XX=y
-CONFIG_BLK_DEV_IDE_MODES=y
CONFIG_BLK_DEV_ATARAID=m
CONFIG_BLK_DEV_ATARAID_PDC=m
CONFIG_BLK_DEV_ATARAID_HPT=m
diff -ur linux-2.4.orig/arch/x86_64/config.in linux-2.4/arch/x86_64/config.in
--- linux-2.4.orig/arch/x86_64/config.in 2003-11-28 19:26:19.000000000 +0100
+++ linux-2.4/arch/x86_64/config.in 2004-01-27 21:27:39.000000000 +0100
@@ -139,7 +139,6 @@
if [ "$CONFIG_IDE" != "n" ]; then
source drivers/ide/Config.in
else
- define_bool CONFIG_BLK_DEV_IDE_MODES n
define_bool CONFIG_BLK_DEV_HD n
fi
endmenu
diff -ur linux-2.4.orig/arch/x86_64/defconfig linux-2.4/arch/x86_64/defconfig
--- linux-2.4.orig/arch/x86_64/defconfig 2003-11-28 19:26:19.000000000 +0100
+++ linux-2.4/arch/x86_64/defconfig 2004-01-27 21:27:39.000000000 +0100
@@ -272,7 +272,6 @@
CONFIG_IDEDMA_AUTO=y
# CONFIG_IDEDMA_IVB is not set
# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
# CONFIG_BLK_DEV_ATARAID is not set
# CONFIG_BLK_DEV_ATARAID_PDC is not set
# CONFIG_BLK_DEV_ATARAID_HPT is not set
diff -ur linux-2.4.orig/drivers/ide/Config.in linux-2.4/drivers/ide/Config.in
--- linux-2.4.orig/drivers/ide/Config.in 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/drivers/ide/Config.in 2004-01-27 21:27:39.000000000 +0100
@@ -187,41 +187,6 @@
## dep_mbool CONFIG_BLK_DEV_NTF_DISK $CONFIG_BLK_DEV_IDEDISK
##fi
-if [ "$CONFIG_BLK_DEV_4DRIVES" = "y" -o \
- "$CONFIG_BLK_DEV_ALI14XX" != "n" -o \
- "$CONFIG_BLK_DEV_DTC2278" != "n" -o \
- "$CONFIG_BLK_DEV_HT6560B" != "n" -o \
- "$CONFIG_BLK_DEV_PDC4030" != "n" -o \
- "$CONFIG_BLK_DEV_QD65XX" != "n" -o \
- "$CONFIG_BLK_DEV_UMC8672" != "n" -o \
- "$CONFIG_BLK_DEV_AEC62XX" = "y" -o \
- "$CONFIG_BLK_DEV_ALI15X3" = "y" -o \
- "$CONFIG_BLK_DEV_AMD74XX" = "y" -o \
- "$CONFIG_BLK_DEV_CMD640" = "y" -o \
- "$CONFIG_BLK_DEV_CMD64X" = "y" -o \
- "$CONFIG_BLK_DEV_CS5530" = "y" -o \
- "$CONFIG_BLK_DEV_CY82C693" = "y" -o \
- "$CONFIG_BLK_DEV_HPT34X" = "y" -o \
- "$CONFIG_BLK_DEV_HPT366" = "y" -o \
- "$CONFIG_BLK_DEV_IDE_PMAC" = "y" -o \
- "$CONFIG_BLK_DEV_IT8172" = "y" -o \
- "$CONFIG_BLK_DEV_MPC8xx_IDE" = "y" -o \
- "$CONFIG_BLK_DEV_NFORCE" = "y" -o \
- "$CONFIG_BLK_DEV_OPTI621" = "y" -o \
- "$CONFIG_BLK_DEV_SVWKS" = "y" -o \
- "$CONFIG_BLK_DEV_PDC202XX" = "y" -o \
- "$CONFIG_BLK_DEV_PIIX" = "y" -o \
- "$CONFIG_BLK_DEV_SVWKS" = "y" -o \
- "$CONFIG_BLK_DEV_SIIMAGE" = "y" -o \
- "$CONFIG_BLK_DEV_SIS5513" = "y" -o \
- "$CONFIG_BLK_DEV_SL82C105" = "y" -o \
- "$CONFIG_BLK_DEV_SLC90E66" = "y" -o \
- "$CONFIG_BLK_DEV_VIA82CXXX" = "y" ]; then
- define_bool CONFIG_BLK_DEV_IDE_MODES y
-else
- define_bool CONFIG_BLK_DEV_IDE_MODES n
-fi
-
dep_tristate 'Support for IDE Raid controllers (EXPERIMENTAL)' CONFIG_BLK_DEV_ATARAID $CONFIG_BLK_DEV_IDE $CONFIG_EXPERIMENTAL
dep_tristate ' Support Promise software RAID (Fasttrak(tm)) (EXPERIMENTAL)' CONFIG_BLK_DEV_ATARAID_PDC $CONFIG_BLK_DEV_IDE $CONFIG_EXPERIMENTAL $CONFIG_BLK_DEV_ATARAID
dep_tristate ' Highpoint 370 software RAID (EXPERIMENTAL)' CONFIG_BLK_DEV_ATARAID_HPT $CONFIG_BLK_DEV_IDE $CONFIG_EXPERIMENTAL $CONFIG_BLK_DEV_ATARAID
^ permalink raw reply
* OOPS report: cdrecord -scanbus *after* usb device removal
From: Joël Bourquard @ 2004-01-27 22:06 UTC (permalink / raw)
To: linux-kernel
First of all, I've had lots of fun with the 2.6 kernels. They work
great, faster, and I hope they become the standard soon. A big thanks to
the developers !
Ok. This is my first bug report, so if anything is missing, please tell
me. Thanks.
Kernel is 2.6.2-rc2 with the following things added:
- LUFS
- cryptoloop
- vmware
- small unusual_devs.h and wlan monitor patch.
I can reproduce a OOPS every time I do this:
1 - connect my usb2.0 cd-rw drive
2 - "cdrecord -scanbus"
3 - disconnect the drive
4 - "cdrecord -scanbus"
Disconnection is fine, but an OOPS happens in step 4, every time I
tried. This is probably valid for all 2.6.x. The 2.5.x versions had an
issue with my NEC USB2 controller, so I didn't use them.
The following things gets logged during the procedure:
=====================================================================
hub 1-0:1.0: new USB device on port 2, assigned address 2
SCSI subsystem initialized
Initializing USB Mass Storage driver...
scsi0 : SCSI emulation for USB Mass Storage devices
Vendor: GENERIC Model: CDRCB02 Rev: 1.02
Type: CD-ROM ANSI SCSI revision: 02
WARNING: USB Mass Storage data integrity not assured
USB Mass Storage device found at 2
drivers/usb/core/usb.c: registered new driver usb-storage
USB Mass Storage support registered.
Attached scsi generic sg0 at scsi0, channel 0, id 0, lun 0, type 5
request_module: failed /sbin/modprobe -- char-major-97-0. error = 256
usb 1-2: USB disconnect, address 2
Unable to handle kernel paging request at virtual address 312f322d
printing eip:
c0161c49
*pde = 00000000
Oops: 0000 [#1]
CPU: 0
EIP: 0060:[<c0161c49>] Tainted: P
EFLAGS: 00010202
EIP is at cdev_get+0x29/0xc0
eax: d8624000 ebx: 312f322d ecx: 00000015 edx: d8625f28
esi: 00000001 edi: d93a52a0 ebp: d8624000 esp: d8625ed4
ds: 007b es: 007b ss: 0068
Process cdrecord (pid: 5188, threadinfo=d8624000 task=d93ee120)
Stack: debd4260 d9072300 d93a52a0 00000000 c0161b2f d93a52a0 c0221f8d
01500000
d93a52a0 dea2ecd8 d8624000 c0161b10 00000000 d8624000 00000000
00000000
00000000 c01619c1 df760c00 01500000 d8625f28 00000000 d85a4d40
dea2ecd8
Call Trace:
[<c0161b2f>] exact_lock+0xf/0x20
[<c0221f8d>] kobj_lookup+0xfd/0x200
[<c0161b10>] exact_match+0x0/0x10
[<c01619c1>] chrdev_open+0x191/0x210
[<c01575bb>] dentry_open+0x14b/0x220
[<c0157468>] filp_open+0x68/0x70
[<c015791b>] sys_open+0x5b/0x90
[<c010b489>] sysenter_past_esp+0x52/0x71
Code: 83 3b 02 0f 84 7d 00 00 00 ff 83 a0 00 00 00 b8 00 e0 ff ff
<6>note: cdrecord[5188] exited with preempt_count 1
bad: scheduling while atomic!
Call Trace:
[<c011fcb7>] schedule+0x597/0x5a0
[<c0148afb>] zap_pmd_range+0x4b/0x70
[<c0148b6b>] unmap_page_range+0x4b/0x80
[<c0148d76>] unmap_vmas+0x1d6/0x230
[<c014cc88>] exit_mmap+0x78/0x190
[<c0121715>] mmput+0x65/0xc0
[<c0125761>] do_exit+0x151/0x3e0
[<c010c57c>] die+0xec/0xf0
[<c011dd79>] do_page_fault+0x1f9/0x519
[<c01400ee>] buffered_rmqueue+0xbe/0x160
[<c014023f>] __alloc_pages+0xaf/0x360
[<c013c21c>] find_get_page+0x2c/0x60
[<c013d3bf>] filemap_nopage+0x26f/0x370
[<c011db80>] do_page_fault+0x0/0x519
[<c010bee5>] error_code+0x2d/0x38
[<c0161c49>] cdev_get+0x29/0xc0
[<c0161b2f>] exact_lock+0xf/0x20
[<c0221f8d>] kobj_lookup+0xfd/0x200
[<c0161b10>] exact_match+0x0/0x10
[<c01619c1>] chrdev_open+0x191/0x210
[<c01575bb>] dentry_open+0x14b/0x220
[<c0157468>] filp_open+0x68/0x70
[<c015791b>] sys_open+0x5b/0x90
[<c010b489>] sysenter_past_esp+0x52/0x71
=====================================================================
Hope this helps !
Regards,
Joël
^ permalink raw reply
* Re: Patch for review and testing
From: James Simmons @ 2004-01-27 22:09 UTC (permalink / raw)
To: Benjamin Herrenschmidt
Cc: Geert Uytterhoeven, Linux Fbdev development list, Andrew Morton
In-Reply-To: <1075239579.6296.211.camel@gaston>
> > I like to submit this patch to linus today. Could you test it to see if it
> > works on ppcs.
>
> Well... you didn't update the drivers calling get_EDID_from_OF (I think
> only rivafb at this point).
The patch is against the vanilla tree. In the fbdev-2.5 tree I have to
update rivafb for this. Actually I will remove that code from rivafb.
> Also, I plan to deprecate that function in
> fbmon anyway, so don't bother, leave it alone for now. The way the
> display/EDID infos are laid out in the OF device tree isn't that
> generic and I'm considering letting each driver has its own version...
Then I will remove it.
> Also, that construct is plain wrong:
>
> char *get_EDID_from_Firmware(struct device *dev)
> {
> .../...
> pdev = to_pci_dev(dev);
>
> Either pass a pci_dev in, or if not, at least check that you are
> dealing with a pci device before casting struct device...
That was to make the function generic. Well it doesn't matter as I'm going
to remove the OF function so the pci stuff can go away.
> Finally, I don't see the point of submiting things to Linus at this
> point, especially this patch which isn't critical (and you didn't even
> submit driver changes for _using_ the new feature).
Actually it is. The BIOS calls can hang some intel machines or make
booting up to 5 seconds longer waiting for the data. If this was not the
case I wouldn't be submitting it.
> Andrew is the
> maintainer of current 2.6.x stable, patches have to go to him first,
> stage in -mm for a while to be tested, and then go to Linus.
This is just making the code conditional. I will send another patch in a
minute then.
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
^ permalink raw reply
* [PATCH] 2.4 ACPI dispatcher/dsmthdat.c warning fix
From: Krzysztof Halasa @ 2004-01-27 21:54 UTC (permalink / raw)
To: marcelo.tosatti; +Cc: lkml
[-- Attachment #1: Type: text/plain, Size: 294 bytes --]
Hi,
I think this is what the author meant, i.e. we don't need to substitute
obj_desc = new_obj_desc there as it is done later in the file.
This patch doesn't change kernel behaviour, it only eliminates the
warning message.
Please apply to 2.4 kernel tree. Thanks.
--
Krzysztof Halasa, B*FH
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: dsmthdat-2.4.25pre7.patch --]
[-- Type: text/x-patch, Size: 438 bytes --]
--- linux-2.4.orig/drivers/acpi/dispatcher/dsmthdat.c 2004-01-27 21:22:26.000000000 +0100
+++ linux-2.4/drivers/acpi/dispatcher/dsmthdat.c 2004-01-27 22:41:04.000000000 +0100
@@ -601,7 +601,6 @@
new_obj_desc = obj_desc;
if (obj_desc->common.reference_count > 1) {
status = acpi_ut_copy_iobject_to_iobject (obj_desc, &new_obj_desc, walk_state);
- new_obj_desc;
if (ACPI_FAILURE (status)) {
return_ACPI_STATUS (status);
}
^ permalink raw reply
* [TRIVIAL PATCH] 2.4.25pre7 warning fix
From: Krzysztof Halasa @ 2004-01-27 21:28 UTC (permalink / raw)
To: marcelo.tosatti; +Cc: lkml
[-- Attachment #1: Type: text/plain, Size: 476 bytes --]
Hi,
The attached patch fixes the following warning msg:
time.c:435: warning: `do_gettimeoffset_cyclone' defined but not used
There is no need to define functions which do just { return 0; } and
which aren't called by anything.
(In case CONFIG_X86_SUMMIT is defined, there is another (real)
do_gettimeoffset_cyclone() function, and it is referenced - but
it's simply not related to this empty function).
Please apply to 2.4 kernel tree. Thanks.
--
Krzysztof Halasa, B*FH
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: time-2.4.23pre9.patch --]
[-- Type: text/x-patch, Size: 433 bytes --]
--- linux-2.4.orig/arch/i386/kernel/time.c 2003-10-24 22:48:15.000000000 +0200
+++ linux-2.4/arch/i386/kernel/time.c 2003-11-09 17:38:18.000000000 +0100
@@ -430,7 +430,6 @@
const int use_cyclone = 0;
static void mark_timeoffset_cyclone(void) {}
-static unsigned long do_gettimeoffset_cyclone(void) {return 0;}
static void init_cyclone_clock(void) {}
void __cyclone_delay(unsigned long loops) {}
#endif /* CONFIG_X86_SUMMIT */
^ permalink raw reply
* [TRIVIAL PATCH] 2.4 make dep and hisax/Makefile md5sum warning fix
From: Krzysztof Halasa @ 2004-01-27 21:13 UTC (permalink / raw)
To: marcelo.tosatti; +Cc: lkml, kkeil, kai.germaschewski, isdn4linux
[-- Attachment #1: Type: text/plain, Size: 336 bytes --]
Hi,
The following patch suppresses the "md5sum: WARNING: 1 of 13 computed
checksums did NOT match" warning from make dep.
The "md5sum -c" status is still used by the drivers (some certification
requirement for ISDN equipment in Germany).
Unless they are objections please apply to 2.4 kernel tree. Thanks.
--
Krzysztof Halasa, B*FH
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: hisax-md5sum-2.4.25pre7.patch --]
[-- Type: text/x-patch, Size: 512 bytes --]
--- linux-2.4.orig/drivers/isdn/hisax/Makefile 2003-06-13 16:51:34.000000000 +0200
+++ linux-2.4/drivers/isdn/hisax/Makefile 2004-01-27 22:05:31.000000000 +0100
@@ -66,7 +66,7 @@
obj-$(CONFIG_HISAX_FRITZ_PCIPNP) += hisax_isac.o hisax_fcpcipnp.o
obj-$(CONFIG_USB_AUERISDN) += isdnhdlc.o
-CERT := $(shell md5sum -c md5sums.asc >> /dev/null;echo $$?)
+CERT := $(shell md5sum --status -c md5sums.asc >> /dev/null;echo $$?)
CFLAGS_cert.o := -DCERTIFICATION=$(CERT)
include $(TOPDIR)/Rules.make
^ permalink raw reply
* Re: [OT] Sco
From: Krzysztof Halasa @ 2004-01-27 18:36 UTC (permalink / raw)
To: Timothy Miller; +Cc: walt, Linux Kernel
In-Reply-To: <40169031.50603@techsource.com>
Timothy Miller <miller@techsource.com> writes:
> As much as SCO disturbs me, these kinds of underhanded attacks against
> them disgust me. They stoop to SCO's level, or worse. SCO can and
> will be dealt with properly through the use of FACTS.
Not sure if we need to deal with SCO at all. Who they are that they
require our attention?
> Besides, DoS attacks against SCO will only be blamed on the Linux
> community. So the developer of that virus is either a complete idiot
> or is acting to intentionally hurt our image.
Not sure if author of this virus (and/or other ones) has anything to do
with Linux and/or Linux community at all.
With some MS Windows programming community, maybe.
--
Krzysztof Halasa, B*FH
^ permalink raw reply
* Re: [Kernel-janitors] [PATCH] drivers/video/fbcmap.c kmalloc audit
From: Randy.Dunlap @ 2004-01-27 22:05 UTC (permalink / raw)
To: kernel-janitors
In-Reply-To: <1075239420.3744.18.camel@ibm-d.pdx.osdl.net>
On Tue, 27 Jan 2004 22:54:19 +0100 Daniele Bellucci <bellucda@tiscali.it> wrote:
|
| |+ err_transp:
| |+ kfree(cmap->blue);
| |+ err_blue:
| |+ kfree(cmap->green);
| |+ err_green:
| |+ kfree(cmap->red);
| |+ err_red:
| |+ cmap->red = cmap->green = cmap->blue = cmap->transp = NULL;
| |+ cmap->len = 0;
| |+ return -1; <--+
| |
| ---------------------+
| |
| +-> IMHO "return -1" should be replaced with "return -ENOMEM"
Maybe in theory. In practice it is documented to return 0 for
success or -1 on error. Changing that would require auditing all
callers of it....
--
~Randy
kernel-janitors project: http://janitor.kernelnewbies.org/
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply
* Re: udevinfo output broken
From: Greg KH @ 2004-01-27 22:05 UTC (permalink / raw)
To: linux-hotplug
In-Reply-To: <20040127200651.GA7974@suse.de>
On Tue, Jan 27, 2004 at 10:54:31PM +0100, Olaf Hering wrote:
> On Tue, Jan 27, Olaf Hering wrote:
>
> > On Tue, Jan 27, Kay Sievers wrote:
> >
> > > On Tue, Jan 27, 2004 at 09:06:51PM +0100, Olaf Hering wrote:
> > > > udevinfo writes to fd 0, all the output is lost somehow.
> > > >
> > > > olaf@ibook:~> i="`/sbin/udevinfo -r 2>&1`"
> > > > /dev/
> > >
> > > Seems like a klibc feature :)
> > > libc works as expected.
> >
> > _fwrite gets 0x1 as f, calls fileno() which decrements it and passes it
> > to write().
>
> No idea if this is correct:
>
> --- klibc-0.98/klibc/include/stdio.h 2004-01-22 21:56:49.000000000 +0100
> +++ klibc/klibc/include/stdio.h 2004-01-27 22:50:27.000000000 +0100
> @@ -15,9 +15,9 @@
> struct _IO_file;
> typedef struct _IO_file FILE;
>
> -#define stdin ((FILE *)0)
> -#define stdout ((FILE *)1)
> -#define stderr ((FILE *)2)
> +#define stdin ((FILE *)1)
> +#define stdout ((FILE *)2)
> +#define stderr ((FILE *)3)
>
> #ifndef EOF
> # define EOF (-1)
>
I don't know about your change, but I traced the regression down to this
recent recent change in klibc:
diff -Nru a/klibc/klibc/include/stdio.h b/klibc/klibc/include/stdio.h
--- a/klibc/klibc/include/stdio.h Tue Jan 27 14:00:35 2004
+++ b/klibc/klibc/include/stdio.h Tue Jan 27 14:00:35 2004
@@ -31,15 +31,22 @@
#define SEEK_CUR 1
#define SEEK_END 2
+/*
+ * Convert between a FILE * and a file descriptor. We don't actually
+ * have any in-memory data, so we just abuse the pointer itself to
+ * hold the data. Note, however, that for file descriptors, -1 is
+ * error and 0 is a valid value; for FILE *, NULL (0) is error and
+ * non-NULL are valid.
+ */
static __inline__ int fileno(FILE *__f)
{
/* This should really be intptr_t, but size_t should be the same size */
- return (int)(size_t)__f;
+ return (int)(size_t)__f - 1;
}
static __inline__ FILE * __create_file(int __fd)
{
- return (FILE *)(size_t)__fd;
+ return (FILE *)(size_t)(__fd + 1);
}
__extern FILE *fopen(const char *, const char *);
Peter, any reason for doing this? It seems to change the way stdout
works.
thanks,
greg k-h
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
Linux-hotplug-devel mailing list http://linux-hotplug.sourceforge.net
Linux-hotplug-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel
^ permalink raw reply
* Caddy Plextor 12Plex
From: Guennadi Liakhovetski @ 2004-01-27 22:02 UTC (permalink / raw)
To: linux-scsi
Hi
I've got an old SCSI caddy-type CD-R, that works "sometimes". I.e.,
sometimes you insert a CD, and everything is ok - you can mount, read it,
but ejecting is only possible with "eject", the button has no effect. But
sometimes the same disk is inserted, and the ON/BUSY light starts
blinking, pressing / issuing eject only has the effect that the light
returns to the "ON" state. The disk is neither readable, nor ejectable.
Then the only way to get it out is with a pin. Then the disk goes out, but
still cannot be removed. To remove it another eject command / button press
is needed. But the CDR will not work at least until power-off / on.
The controller is an AM53C974. Same under 2.4 and 2.6. So, the question -
is the CDR physically dead, or is it possible to get it to work with some
extra software effort?
Thanks
Guennadi
---
Guennadi Liakhovetski
^ permalink raw reply
* Re: Encrypted Filesystem
From: Jan Harkes @ 2004-01-27 22:01 UTC (permalink / raw)
To: linux-kernel
In-Reply-To: <y2ar7xmkyqe.fsf@cartman.at.fivegeeks.net>
On Tue, Jan 27, 2004 at 12:43:21AM +0000, Adam Sampson wrote:
> Michael A Halcrow <mahalcro@us.ibm.com> writes:
>
> > - Userland filesystem-based (EncFS+FUSE, CryptoFS+LUFS)
>
> Going off on a tangent...
>
> There are all sorts of potentially-interesting things that could be
> done if Linux had a userspace filesystem mechanism included in the
> standard kernel -- as well as encryption, there's also network
> filesystems, various sorts of specialised caching (such as Zero
> Install), automounter-like systems, prototyping and so on.
>
> Is there a technical reason that none of the userspace filesystem
> layers have been included in the stock kernel, or is it just that
> nobody's submitted any of them for inclusion yet?
Ehh, Coda's kernel module does just that. It is used by the userspace
cache manager of the Coda Distributed File System.
http://www.coda.cs.cmu.edu/
But several other projects seem to be using it,
http://uservfs.sourceforge.net/
http://dav.sourceforge.net/
The interface to userspace a bit clumsy to work with, but there are
kernel modules for FreeBSD/NetBSD/Solaris and an experimental one for
Windows 2000/NT/XP, which makes any significant changes a bit of a pain.
It does have it's pecularities, reads and writes are not passed up to
userspace, only the open and close VFS calls. This makes the module
reasonably quite simple as it doesn't have to deal with VM issues and it
isn't susceptible to deadlocks,
app wants to read data from a file ->
userspace application requires memory allocation to provide this data ->
VM tries to write out dirty data associated with the Coda mountpoint ==
deadlock
So whole file caching keeps the kernel module more portable and
simplifies the userspace code. But it makes things like streaming
reads/writes or quotas impossible. If you want to provide encryption
there you would have to store an unencrypted copy of every open file
somewhere on disk or in ramfs/tmpfs and incur the cost of (de)crypting
(and (de)compressing) whenever it is opened or closed.
Jan
^ permalink raw reply
* Re: [PATCH] Remove memblks from the kernel
From: Matthew Dobson @ 2004-01-27 21:56 UTC (permalink / raw)
To: Martin J. Bligh; +Cc: akpm, linux-kernel
In-Reply-To: <237770000.1074843321@[10.10.2.4]>
Martin J. Bligh wrote:
> This patch removes memblks from the kernel ... we don't use them, and
> the NUMA API that was planning to use them when they were originally
> designed isn't going to use them anymore. They're just unnecessary
> added complexity now ... time for them to go.
>
> There's a slight complication in that ia64 uses something with a similar
> name for part of its memory layout, but Jes Sorensen kindly untangled them
> from each other for us. The patch with his modifications is below. Jes
> tested it on ia64, and I testbuilt it with every config in my arsenal.
>
> Please apply ... thanks,
>
> M.
As the unfortunate soul who pushed this whole memblk concept way back
when, I'll add my support for their removal. The things I envisioned
happening with memblks never materialized and so Martin is right, now
they're just taking up space. Adios memblks, we barely knew ye.
Cheers!
-Matt
^ permalink raw reply
* Re: [PATCH][2.6] PCI Scan all functions
From: John Rose @ 2004-01-27 21:57 UTC (permalink / raw)
To: Greg KH; +Cc: Jake Moilanen, Andrew Morton, lkml, torvalds
In-Reply-To: <20040127211253.GA27583@kroah.com>
Hi-
> Heh, I think the PPC64 people need to get together and all talk about
> this, as I just got a different patch, that solves much the same problem
> from John Rose (it's on the linuxppc64 mailing list.)
>
> Can you two get together and not patch the same section of code to do
> the same thing in different ways?
These patches don't address the same problem. Jake's problem has to do
with pci_scan_slot() ending too soon when going from function 0->7 at
boot time. My problem has to do with pci_scan_slot() going too far from
function 0->7 at dlpar add time. Greg, will follow up with you outside
of this thread.
Thanks-
John
--
John Rose <johnrose@austin.ibm.com>
^ permalink raw reply
* Re: [PATCH][2.6] PCI Scan all functions
From: Linus Torvalds @ 2004-01-27 21:57 UTC (permalink / raw)
To: Andrew Morton; +Cc: Greg KH, moilanen, johnrose, linux-kernel, Anton Blanchard
In-Reply-To: <20040127133314.0ddf00cd.akpm@osdl.org>
On Tue, 27 Jan 2004, Andrew Morton wrote:
>
> While we're on the topic, what's with the below patch? I've had it in -mm
> for ages but apparently there's some disagreement over it.
I'd be very worried, since I'm pretty sure that there _are_ devices where
"zero means disabled".
On the other hand, the resource management should do the right thing
anyway, so I guess it should be safe. Especially if it's been in -mm for a
long time..
Linus
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.